diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time - SELECT bbdmi.*, bboi.customer_name, eemi.help_instruction, bbdmii.item_category_name + SELECT bbdmi.*, bboi.customer_name, eemi.help_instruction, bbdmii.item_category_name, bbdmii.belong_standard_equipment FROM biz_business_device_measure_info bbdmi JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmi.item_id JOIN eqpt_equipment_model_info eemi ON eemi.id = bbdmii.device_model_id - JOIN biz_business_order_sample_relation bbosr ON (bbosr.order_id = bbdmi.order_id AND bbosr.sample_id = - bbdmi.sample_id) + JOIN biz_business_order_sample_relation bbosr ON (bbosr.order_id = bbdmi.order_id AND bbosr.sample_id = bbdmi.sample_id) JOIN biz_business_order_info bboi ON bbosr.order_id = bboi.id WHERE 1=1 @@ -97,7 +94,7 @@ + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time - SELECT bbdmi.*, bboi.customer_name, eemi.help_instruction, bbdmii.item_category_name + SELECT bbdmi.*, bboi.customer_name, eemi.help_instruction, bbdmii.item_category_name, bbdmii.belong_standard_equipment FROM biz_business_device_measure_info bbdmi JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmi.item_id JOIN eqpt_equipment_model_info eemi ON eemi.id = bbdmii.device_model_id - JOIN biz_business_order_sample_relation bbosr ON (bbosr.order_id = bbdmi.order_id AND bbosr.sample_id = - bbdmi.sample_id) + JOIN biz_business_order_sample_relation bbosr ON (bbosr.order_id = bbdmi.order_id AND bbosr.sample_id = bbdmi.sample_id) JOIN biz_business_order_info bboi ON bbosr.order_id = bboi.id WHERE 1=1 @@ -97,7 +94,7 @@ + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time - SELECT bbdmi.*, bboi.customer_name, eemi.help_instruction, bbdmii.item_category_name + SELECT bbdmi.*, bboi.customer_name, eemi.help_instruction, bbdmii.item_category_name, bbdmii.belong_standard_equipment FROM biz_business_device_measure_info bbdmi JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmi.item_id JOIN eqpt_equipment_model_info eemi ON eemi.id = bbdmii.device_model_id - JOIN biz_business_order_sample_relation bbosr ON (bbosr.order_id = bbdmi.order_id AND bbosr.sample_id = - bbdmi.sample_id) + JOIN biz_business_order_sample_relation bbosr ON (bbosr.order_id = bbdmi.order_id AND bbosr.sample_id = bbdmi.sample_id) JOIN biz_business_order_info bboi ON bbosr.order_id = bboi.id WHERE 1=1 @@ -97,7 +94,7 @@ + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java new file mode 100644 index 0000000..4f0ca46 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityProcessRecordMapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityProcessRecordServiceImpl extends ServiceImpl implements IBizQualityProcessRecordService { + + @Override + public List selectBizQualityProcessRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityProcessRecordPage(query, page); + } + +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java new file mode 100644 index 0000000..4f0ca46 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityProcessRecordMapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityProcessRecordServiceImpl extends ServiceImpl implements IBizQualityProcessRecordService { + + @Override + public List selectBizQualityProcessRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityProcessRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java new file mode 100644 index 0000000..7722480 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + + @Override + public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityRepRelPage(query, page); + } + +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java new file mode 100644 index 0000000..4f0ca46 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityProcessRecordMapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityProcessRecordServiceImpl extends ServiceImpl implements IBizQualityProcessRecordService { + + @Override + public List selectBizQualityProcessRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityProcessRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java new file mode 100644 index 0000000..7722480 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + + @Override + public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityRepRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java new file mode 100644 index 0000000..3769fa1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -0,0 +1,75 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.enums.quality.QualityFileNoEnum; +import com.casic.missiles.enums.quality.QualityFileTypeEnum; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import com.casic.missiles.utils.NoGeneratorUtil; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService { + private final IBizLabRelDeptService relDeptService; + private final AbstractPermissionContext permissionContext; + + public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) { + this.relDeptService = relDeptService; + this.permissionContext = permissionContext; + } + + @Override + public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); + } + + @Override + public Long selectMaxNo(QueryWrapper query) { + return this.baseMapper.selectMaxNo(query); + } + + @Override + public List labList(QueryWrapper query) { + List deptList = relDeptService.list(query); + for (BizLabRelDept bizLabRelDept : deptList) { + bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId())); + } + return deptList; + } + + @Override + public boolean save(BizQualitySupervisionRecord entity) { + //生成文件编码 系统号类同 + //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号 + String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), 0l); + //检索最大编码 + String queryCode = code.substring(0, 15); + + QueryWrapper query = new QueryWrapper<>(); + query.like("file_code", queryCode); + Long maxNo = this.selectMaxNo(query); + String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), maxNo); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + + return super.save(entity); + } +} \ No newline at end of file diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java new file mode 100644 index 0000000..4f0ca46 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityProcessRecordMapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityProcessRecordServiceImpl extends ServiceImpl implements IBizQualityProcessRecordService { + + @Override + public List selectBizQualityProcessRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityProcessRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java new file mode 100644 index 0000000..7722480 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + + @Override + public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityRepRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java new file mode 100644 index 0000000..3769fa1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -0,0 +1,75 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.enums.quality.QualityFileNoEnum; +import com.casic.missiles.enums.quality.QualityFileTypeEnum; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import com.casic.missiles.utils.NoGeneratorUtil; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService { + private final IBizLabRelDeptService relDeptService; + private final AbstractPermissionContext permissionContext; + + public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) { + this.relDeptService = relDeptService; + this.permissionContext = permissionContext; + } + + @Override + public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); + } + + @Override + public Long selectMaxNo(QueryWrapper query) { + return this.baseMapper.selectMaxNo(query); + } + + @Override + public List labList(QueryWrapper query) { + List deptList = relDeptService.list(query); + for (BizLabRelDept bizLabRelDept : deptList) { + bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId())); + } + return deptList; + } + + @Override + public boolean save(BizQualitySupervisionRecord entity) { + //生成文件编码 系统号类同 + //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号 + String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), 0l); + //检索最大编码 + String queryCode = code.substring(0, 15); + + QueryWrapper query = new QueryWrapper<>(); + query.like("file_code", queryCode); + Long maxNo = this.selectMaxNo(query); + String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), maxNo); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + + return super.save(entity); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java new file mode 100644 index 0000000..50fea02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -0,0 +1,29 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRepServiceImpl extends ServiceImpl implements IBizQualitySupervisionRepService { + @Override + public List selectBizQualitySupervisionRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRepPage(query, page); + } +} \ No newline at end of file diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java new file mode 100644 index 0000000..4f0ca46 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityProcessRecordMapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityProcessRecordServiceImpl extends ServiceImpl implements IBizQualityProcessRecordService { + + @Override + public List selectBizQualityProcessRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityProcessRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java new file mode 100644 index 0000000..7722480 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + + @Override + public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityRepRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java new file mode 100644 index 0000000..3769fa1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -0,0 +1,75 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.enums.quality.QualityFileNoEnum; +import com.casic.missiles.enums.quality.QualityFileTypeEnum; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import com.casic.missiles.utils.NoGeneratorUtil; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService { + private final IBizLabRelDeptService relDeptService; + private final AbstractPermissionContext permissionContext; + + public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) { + this.relDeptService = relDeptService; + this.permissionContext = permissionContext; + } + + @Override + public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); + } + + @Override + public Long selectMaxNo(QueryWrapper query) { + return this.baseMapper.selectMaxNo(query); + } + + @Override + public List labList(QueryWrapper query) { + List deptList = relDeptService.list(query); + for (BizLabRelDept bizLabRelDept : deptList) { + bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId())); + } + return deptList; + } + + @Override + public boolean save(BizQualitySupervisionRecord entity) { + //生成文件编码 系统号类同 + //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号 + String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), 0l); + //检索最大编码 + String queryCode = code.substring(0, 15); + + QueryWrapper query = new QueryWrapper<>(); + query.like("file_code", queryCode); + Long maxNo = this.selectMaxNo(query); + String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), maxNo); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + + return super.save(entity); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java new file mode 100644 index 0000000..50fea02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -0,0 +1,29 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRepServiceImpl extends ServiceImpl implements IBizQualitySupervisionRepService { + @Override + public List selectBizQualitySupervisionRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRepPage(query, page); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index a730958..273a88b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -7,6 +7,9 @@ import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板项 服务实现类 @@ -18,4 +21,23 @@ @Service public class BizQualityTemplateItemServiceImpl extends ServiceImpl implements IBizQualityTemplateItemService { + @Override + public void saveList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(new Date()); + } + saveBatch(bizQualityTemplateItems); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + if (bizQualityTemplateItem.getId() != null) { + bizQualityTemplateItem.setUpdateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplateItems); + } } diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java new file mode 100644 index 0000000..4f0ca46 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityProcessRecordMapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityProcessRecordServiceImpl extends ServiceImpl implements IBizQualityProcessRecordService { + + @Override + public List selectBizQualityProcessRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityProcessRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java new file mode 100644 index 0000000..7722480 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + + @Override + public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityRepRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java new file mode 100644 index 0000000..3769fa1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -0,0 +1,75 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.enums.quality.QualityFileNoEnum; +import com.casic.missiles.enums.quality.QualityFileTypeEnum; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import com.casic.missiles.utils.NoGeneratorUtil; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService { + private final IBizLabRelDeptService relDeptService; + private final AbstractPermissionContext permissionContext; + + public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) { + this.relDeptService = relDeptService; + this.permissionContext = permissionContext; + } + + @Override + public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); + } + + @Override + public Long selectMaxNo(QueryWrapper query) { + return this.baseMapper.selectMaxNo(query); + } + + @Override + public List labList(QueryWrapper query) { + List deptList = relDeptService.list(query); + for (BizLabRelDept bizLabRelDept : deptList) { + bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId())); + } + return deptList; + } + + @Override + public boolean save(BizQualitySupervisionRecord entity) { + //生成文件编码 系统号类同 + //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号 + String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), 0l); + //检索最大编码 + String queryCode = code.substring(0, 15); + + QueryWrapper query = new QueryWrapper<>(); + query.like("file_code", queryCode); + Long maxNo = this.selectMaxNo(query); + String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), maxNo); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + + return super.save(entity); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java new file mode 100644 index 0000000..50fea02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -0,0 +1,29 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRepServiceImpl extends ServiceImpl implements IBizQualitySupervisionRepService { + @Override + public List selectBizQualitySupervisionRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRepPage(query, page); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index a730958..273a88b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -7,6 +7,9 @@ import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板项 服务实现类 @@ -18,4 +21,23 @@ @Service public class BizQualityTemplateItemServiceImpl extends ServiceImpl implements IBizQualityTemplateItemService { + @Override + public void saveList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(new Date()); + } + saveBatch(bizQualityTemplateItems); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + if (bizQualityTemplateItem.getId() != null) { + bizQualityTemplateItem.setUpdateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplateItems); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index 616c1c0..9e93d7f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -2,11 +2,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.mapper.quality.BizQualityTemplateMapper; import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.service.quality.IBizQualityTemplateService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板信息 服务实现类 @@ -17,5 +22,35 @@ */ @Service public class BizQualityTemplateServiceImpl extends ServiceImpl implements IBizQualityTemplateService { + private final AbstractPermissionContext permissionContext; + public BizQualityTemplateServiceImpl(AbstractPermissionContext permissionContext) { + this.permissionContext = permissionContext; + } + + @Override + public void saveList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + } + saveBatch(bizQualityTemplates); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + if (bizQualityTemplate.getId() != null) { + bizQualityTemplate.setCreateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplates); + } } diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java new file mode 100644 index 0000000..4f0ca46 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityProcessRecordMapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityProcessRecordServiceImpl extends ServiceImpl implements IBizQualityProcessRecordService { + + @Override + public List selectBizQualityProcessRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityProcessRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java new file mode 100644 index 0000000..7722480 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + + @Override + public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityRepRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java new file mode 100644 index 0000000..3769fa1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -0,0 +1,75 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.enums.quality.QualityFileNoEnum; +import com.casic.missiles.enums.quality.QualityFileTypeEnum; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import com.casic.missiles.utils.NoGeneratorUtil; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService { + private final IBizLabRelDeptService relDeptService; + private final AbstractPermissionContext permissionContext; + + public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) { + this.relDeptService = relDeptService; + this.permissionContext = permissionContext; + } + + @Override + public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); + } + + @Override + public Long selectMaxNo(QueryWrapper query) { + return this.baseMapper.selectMaxNo(query); + } + + @Override + public List labList(QueryWrapper query) { + List deptList = relDeptService.list(query); + for (BizLabRelDept bizLabRelDept : deptList) { + bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId())); + } + return deptList; + } + + @Override + public boolean save(BizQualitySupervisionRecord entity) { + //生成文件编码 系统号类同 + //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号 + String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), 0l); + //检索最大编码 + String queryCode = code.substring(0, 15); + + QueryWrapper query = new QueryWrapper<>(); + query.like("file_code", queryCode); + Long maxNo = this.selectMaxNo(query); + String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), maxNo); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + + return super.save(entity); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java new file mode 100644 index 0000000..50fea02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -0,0 +1,29 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRepServiceImpl extends ServiceImpl implements IBizQualitySupervisionRepService { + @Override + public List selectBizQualitySupervisionRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRepPage(query, page); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index a730958..273a88b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -7,6 +7,9 @@ import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板项 服务实现类 @@ -18,4 +21,23 @@ @Service public class BizQualityTemplateItemServiceImpl extends ServiceImpl implements IBizQualityTemplateItemService { + @Override + public void saveList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(new Date()); + } + saveBatch(bizQualityTemplateItems); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + if (bizQualityTemplateItem.getId() != null) { + bizQualityTemplateItem.setUpdateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplateItems); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index 616c1c0..9e93d7f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -2,11 +2,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.mapper.quality.BizQualityTemplateMapper; import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.service.quality.IBizQualityTemplateService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板信息 服务实现类 @@ -17,5 +22,35 @@ */ @Service public class BizQualityTemplateServiceImpl extends ServiceImpl implements IBizQualityTemplateService { + private final AbstractPermissionContext permissionContext; + public BizQualityTemplateServiceImpl(AbstractPermissionContext permissionContext) { + this.permissionContext = permissionContext; + } + + @Override + public void saveList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + } + saveBatch(bizQualityTemplates); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + if (bizQualityTemplate.getId() != null) { + bizQualityTemplate.setCreateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplates); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java index 87f5378..7e2f28d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo; @@ -36,4 +37,6 @@ List list(MeasureInfoListRequest request) throws Exception; List measureInfoListByIds(List ids) throws Exception; + + ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request); } diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java new file mode 100644 index 0000000..4f0ca46 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityProcessRecordMapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityProcessRecordServiceImpl extends ServiceImpl implements IBizQualityProcessRecordService { + + @Override + public List selectBizQualityProcessRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityProcessRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java new file mode 100644 index 0000000..7722480 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + + @Override + public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityRepRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java new file mode 100644 index 0000000..3769fa1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -0,0 +1,75 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.enums.quality.QualityFileNoEnum; +import com.casic.missiles.enums.quality.QualityFileTypeEnum; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import com.casic.missiles.utils.NoGeneratorUtil; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService { + private final IBizLabRelDeptService relDeptService; + private final AbstractPermissionContext permissionContext; + + public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) { + this.relDeptService = relDeptService; + this.permissionContext = permissionContext; + } + + @Override + public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); + } + + @Override + public Long selectMaxNo(QueryWrapper query) { + return this.baseMapper.selectMaxNo(query); + } + + @Override + public List labList(QueryWrapper query) { + List deptList = relDeptService.list(query); + for (BizLabRelDept bizLabRelDept : deptList) { + bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId())); + } + return deptList; + } + + @Override + public boolean save(BizQualitySupervisionRecord entity) { + //生成文件编码 系统号类同 + //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号 + String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), 0l); + //检索最大编码 + String queryCode = code.substring(0, 15); + + QueryWrapper query = new QueryWrapper<>(); + query.like("file_code", queryCode); + Long maxNo = this.selectMaxNo(query); + String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), maxNo); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + + return super.save(entity); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java new file mode 100644 index 0000000..50fea02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -0,0 +1,29 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRepServiceImpl extends ServiceImpl implements IBizQualitySupervisionRepService { + @Override + public List selectBizQualitySupervisionRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRepPage(query, page); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index a730958..273a88b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -7,6 +7,9 @@ import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板项 服务实现类 @@ -18,4 +21,23 @@ @Service public class BizQualityTemplateItemServiceImpl extends ServiceImpl implements IBizQualityTemplateItemService { + @Override + public void saveList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(new Date()); + } + saveBatch(bizQualityTemplateItems); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + if (bizQualityTemplateItem.getId() != null) { + bizQualityTemplateItem.setUpdateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplateItems); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index 616c1c0..9e93d7f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -2,11 +2,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.mapper.quality.BizQualityTemplateMapper; import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.service.quality.IBizQualityTemplateService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板信息 服务实现类 @@ -17,5 +22,35 @@ */ @Service public class BizQualityTemplateServiceImpl extends ServiceImpl implements IBizQualityTemplateService { + private final AbstractPermissionContext permissionContext; + public BizQualityTemplateServiceImpl(AbstractPermissionContext permissionContext) { + this.permissionContext = permissionContext; + } + + @Override + public void saveList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + } + saveBatch(bizQualityTemplates); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + if (bizQualityTemplate.getId() != null) { + bizQualityTemplate.setCreateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplates); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java index 87f5378..7e2f28d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo; @@ -36,4 +37,6 @@ List list(MeasureInfoListRequest request) throws Exception; List measureInfoListByIds(List ids) throws Exception; + + ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java index 5b00b90..d87d86c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java @@ -1,12 +1,12 @@ package com.casic.missiles.service.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureItemInfo; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -32,4 +32,6 @@ List list(MeasureItemListRequest request) throws Exception; + ReturnDTO asTemplate(Long id); + } diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java new file mode 100644 index 0000000..4f0ca46 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityProcessRecordMapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityProcessRecordServiceImpl extends ServiceImpl implements IBizQualityProcessRecordService { + + @Override + public List selectBizQualityProcessRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityProcessRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java new file mode 100644 index 0000000..7722480 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + + @Override + public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityRepRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java new file mode 100644 index 0000000..3769fa1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -0,0 +1,75 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.enums.quality.QualityFileNoEnum; +import com.casic.missiles.enums.quality.QualityFileTypeEnum; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import com.casic.missiles.utils.NoGeneratorUtil; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService { + private final IBizLabRelDeptService relDeptService; + private final AbstractPermissionContext permissionContext; + + public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) { + this.relDeptService = relDeptService; + this.permissionContext = permissionContext; + } + + @Override + public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); + } + + @Override + public Long selectMaxNo(QueryWrapper query) { + return this.baseMapper.selectMaxNo(query); + } + + @Override + public List labList(QueryWrapper query) { + List deptList = relDeptService.list(query); + for (BizLabRelDept bizLabRelDept : deptList) { + bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId())); + } + return deptList; + } + + @Override + public boolean save(BizQualitySupervisionRecord entity) { + //生成文件编码 系统号类同 + //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号 + String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), 0l); + //检索最大编码 + String queryCode = code.substring(0, 15); + + QueryWrapper query = new QueryWrapper<>(); + query.like("file_code", queryCode); + Long maxNo = this.selectMaxNo(query); + String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), maxNo); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + + return super.save(entity); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java new file mode 100644 index 0000000..50fea02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -0,0 +1,29 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRepServiceImpl extends ServiceImpl implements IBizQualitySupervisionRepService { + @Override + public List selectBizQualitySupervisionRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRepPage(query, page); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index a730958..273a88b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -7,6 +7,9 @@ import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板项 服务实现类 @@ -18,4 +21,23 @@ @Service public class BizQualityTemplateItemServiceImpl extends ServiceImpl implements IBizQualityTemplateItemService { + @Override + public void saveList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(new Date()); + } + saveBatch(bizQualityTemplateItems); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + if (bizQualityTemplateItem.getId() != null) { + bizQualityTemplateItem.setUpdateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplateItems); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index 616c1c0..9e93d7f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -2,11 +2,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.mapper.quality.BizQualityTemplateMapper; import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.service.quality.IBizQualityTemplateService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板信息 服务实现类 @@ -17,5 +22,35 @@ */ @Service public class BizQualityTemplateServiceImpl extends ServiceImpl implements IBizQualityTemplateService { + private final AbstractPermissionContext permissionContext; + public BizQualityTemplateServiceImpl(AbstractPermissionContext permissionContext) { + this.permissionContext = permissionContext; + } + + @Override + public void saveList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + } + saveBatch(bizQualityTemplates); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + if (bizQualityTemplate.getId() != null) { + bizQualityTemplate.setCreateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplates); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java index 87f5378..7e2f28d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo; @@ -36,4 +37,6 @@ List list(MeasureInfoListRequest request) throws Exception; List measureInfoListByIds(List ids) throws Exception; + + ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java index 5b00b90..d87d86c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java @@ -1,12 +1,12 @@ package com.casic.missiles.service.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureItemInfo; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -32,4 +32,6 @@ List list(MeasureItemListRequest request) throws Exception; + ReturnDTO asTemplate(Long id); + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java new file mode 100644 index 0000000..43b7986 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface IBizEquipmentStandardCheckInfoEquipmentService extends IService { + +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java new file mode 100644 index 0000000..4f0ca46 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityProcessRecordMapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityProcessRecordServiceImpl extends ServiceImpl implements IBizQualityProcessRecordService { + + @Override + public List selectBizQualityProcessRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityProcessRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java new file mode 100644 index 0000000..7722480 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + + @Override + public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityRepRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java new file mode 100644 index 0000000..3769fa1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -0,0 +1,75 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.enums.quality.QualityFileNoEnum; +import com.casic.missiles.enums.quality.QualityFileTypeEnum; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import com.casic.missiles.utils.NoGeneratorUtil; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService { + private final IBizLabRelDeptService relDeptService; + private final AbstractPermissionContext permissionContext; + + public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) { + this.relDeptService = relDeptService; + this.permissionContext = permissionContext; + } + + @Override + public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); + } + + @Override + public Long selectMaxNo(QueryWrapper query) { + return this.baseMapper.selectMaxNo(query); + } + + @Override + public List labList(QueryWrapper query) { + List deptList = relDeptService.list(query); + for (BizLabRelDept bizLabRelDept : deptList) { + bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId())); + } + return deptList; + } + + @Override + public boolean save(BizQualitySupervisionRecord entity) { + //生成文件编码 系统号类同 + //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号 + String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), 0l); + //检索最大编码 + String queryCode = code.substring(0, 15); + + QueryWrapper query = new QueryWrapper<>(); + query.like("file_code", queryCode); + Long maxNo = this.selectMaxNo(query); + String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), maxNo); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + + return super.save(entity); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java new file mode 100644 index 0000000..50fea02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -0,0 +1,29 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRepServiceImpl extends ServiceImpl implements IBizQualitySupervisionRepService { + @Override + public List selectBizQualitySupervisionRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRepPage(query, page); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index a730958..273a88b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -7,6 +7,9 @@ import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板项 服务实现类 @@ -18,4 +21,23 @@ @Service public class BizQualityTemplateItemServiceImpl extends ServiceImpl implements IBizQualityTemplateItemService { + @Override + public void saveList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(new Date()); + } + saveBatch(bizQualityTemplateItems); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + if (bizQualityTemplateItem.getId() != null) { + bizQualityTemplateItem.setUpdateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplateItems); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index 616c1c0..9e93d7f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -2,11 +2,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.mapper.quality.BizQualityTemplateMapper; import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.service.quality.IBizQualityTemplateService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板信息 服务实现类 @@ -17,5 +22,35 @@ */ @Service public class BizQualityTemplateServiceImpl extends ServiceImpl implements IBizQualityTemplateService { + private final AbstractPermissionContext permissionContext; + public BizQualityTemplateServiceImpl(AbstractPermissionContext permissionContext) { + this.permissionContext = permissionContext; + } + + @Override + public void saveList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + } + saveBatch(bizQualityTemplates); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + if (bizQualityTemplate.getId() != null) { + bizQualityTemplate.setCreateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplates); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java index 87f5378..7e2f28d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo; @@ -36,4 +37,6 @@ List list(MeasureInfoListRequest request) throws Exception; List measureInfoListByIds(List ids) throws Exception; + + ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java index 5b00b90..d87d86c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java @@ -1,12 +1,12 @@ package com.casic.missiles.service.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureItemInfo; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -32,4 +32,6 @@ List list(MeasureItemListRequest request) throws Exception; + ReturnDTO asTemplate(Long id); + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java new file mode 100644 index 0000000..43b7986 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface IBizEquipmentStandardCheckInfoEquipmentService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java index 7656054..4882611 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -29,4 +30,6 @@ List checkInfoListByIds(List ids); List list(CheckInfoListRequest request); + + ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request); } diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java new file mode 100644 index 0000000..4f0ca46 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityProcessRecordMapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityProcessRecordServiceImpl extends ServiceImpl implements IBizQualityProcessRecordService { + + @Override + public List selectBizQualityProcessRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityProcessRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java new file mode 100644 index 0000000..7722480 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + + @Override + public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityRepRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java new file mode 100644 index 0000000..3769fa1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -0,0 +1,75 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.enums.quality.QualityFileNoEnum; +import com.casic.missiles.enums.quality.QualityFileTypeEnum; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import com.casic.missiles.utils.NoGeneratorUtil; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService { + private final IBizLabRelDeptService relDeptService; + private final AbstractPermissionContext permissionContext; + + public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) { + this.relDeptService = relDeptService; + this.permissionContext = permissionContext; + } + + @Override + public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); + } + + @Override + public Long selectMaxNo(QueryWrapper query) { + return this.baseMapper.selectMaxNo(query); + } + + @Override + public List labList(QueryWrapper query) { + List deptList = relDeptService.list(query); + for (BizLabRelDept bizLabRelDept : deptList) { + bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId())); + } + return deptList; + } + + @Override + public boolean save(BizQualitySupervisionRecord entity) { + //生成文件编码 系统号类同 + //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号 + String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), 0l); + //检索最大编码 + String queryCode = code.substring(0, 15); + + QueryWrapper query = new QueryWrapper<>(); + query.like("file_code", queryCode); + Long maxNo = this.selectMaxNo(query); + String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), maxNo); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + + return super.save(entity); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java new file mode 100644 index 0000000..50fea02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -0,0 +1,29 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRepServiceImpl extends ServiceImpl implements IBizQualitySupervisionRepService { + @Override + public List selectBizQualitySupervisionRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRepPage(query, page); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index a730958..273a88b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -7,6 +7,9 @@ import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板项 服务实现类 @@ -18,4 +21,23 @@ @Service public class BizQualityTemplateItemServiceImpl extends ServiceImpl implements IBizQualityTemplateItemService { + @Override + public void saveList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(new Date()); + } + saveBatch(bizQualityTemplateItems); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + if (bizQualityTemplateItem.getId() != null) { + bizQualityTemplateItem.setUpdateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplateItems); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index 616c1c0..9e93d7f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -2,11 +2,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.mapper.quality.BizQualityTemplateMapper; import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.service.quality.IBizQualityTemplateService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板信息 服务实现类 @@ -17,5 +22,35 @@ */ @Service public class BizQualityTemplateServiceImpl extends ServiceImpl implements IBizQualityTemplateService { + private final AbstractPermissionContext permissionContext; + public BizQualityTemplateServiceImpl(AbstractPermissionContext permissionContext) { + this.permissionContext = permissionContext; + } + + @Override + public void saveList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + } + saveBatch(bizQualityTemplates); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + if (bizQualityTemplate.getId() != null) { + bizQualityTemplate.setCreateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplates); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java index 87f5378..7e2f28d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo; @@ -36,4 +37,6 @@ List list(MeasureInfoListRequest request) throws Exception; List measureInfoListByIds(List ids) throws Exception; + + ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java index 5b00b90..d87d86c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java @@ -1,12 +1,12 @@ package com.casic.missiles.service.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureItemInfo; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -32,4 +32,6 @@ List list(MeasureItemListRequest request) throws Exception; + ReturnDTO asTemplate(Long id); + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java new file mode 100644 index 0000000..43b7986 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface IBizEquipmentStandardCheckInfoEquipmentService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java index 7656054..4882611 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -29,4 +30,6 @@ List checkInfoListByIds(List ids); List list(CheckInfoListRequest request); + + ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java index 4b55df7..c4a1b9a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java @@ -50,7 +50,7 @@ List> lists = approvalOperateService.approvalLog(processId); if(!CollectionUtils.isEmpty(lists) && !CollectionUtils.isEmpty(lists.get(1))){ List approvalLogResponses = lists.get(1); - ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(1); + ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(0); String approver = approvalLogResponse.getAssigneeName(); goodsUseDetailMapper.updateByRecordId(id, approver); } diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java new file mode 100644 index 0000000..4f0ca46 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityProcessRecordMapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityProcessRecordServiceImpl extends ServiceImpl implements IBizQualityProcessRecordService { + + @Override + public List selectBizQualityProcessRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityProcessRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java new file mode 100644 index 0000000..7722480 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + + @Override + public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityRepRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java new file mode 100644 index 0000000..3769fa1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -0,0 +1,75 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.enums.quality.QualityFileNoEnum; +import com.casic.missiles.enums.quality.QualityFileTypeEnum; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import com.casic.missiles.utils.NoGeneratorUtil; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService { + private final IBizLabRelDeptService relDeptService; + private final AbstractPermissionContext permissionContext; + + public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) { + this.relDeptService = relDeptService; + this.permissionContext = permissionContext; + } + + @Override + public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); + } + + @Override + public Long selectMaxNo(QueryWrapper query) { + return this.baseMapper.selectMaxNo(query); + } + + @Override + public List labList(QueryWrapper query) { + List deptList = relDeptService.list(query); + for (BizLabRelDept bizLabRelDept : deptList) { + bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId())); + } + return deptList; + } + + @Override + public boolean save(BizQualitySupervisionRecord entity) { + //生成文件编码 系统号类同 + //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号 + String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), 0l); + //检索最大编码 + String queryCode = code.substring(0, 15); + + QueryWrapper query = new QueryWrapper<>(); + query.like("file_code", queryCode); + Long maxNo = this.selectMaxNo(query); + String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), maxNo); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + + return super.save(entity); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java new file mode 100644 index 0000000..50fea02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -0,0 +1,29 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRepServiceImpl extends ServiceImpl implements IBizQualitySupervisionRepService { + @Override + public List selectBizQualitySupervisionRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRepPage(query, page); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index a730958..273a88b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -7,6 +7,9 @@ import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板项 服务实现类 @@ -18,4 +21,23 @@ @Service public class BizQualityTemplateItemServiceImpl extends ServiceImpl implements IBizQualityTemplateItemService { + @Override + public void saveList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(new Date()); + } + saveBatch(bizQualityTemplateItems); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + if (bizQualityTemplateItem.getId() != null) { + bizQualityTemplateItem.setUpdateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplateItems); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index 616c1c0..9e93d7f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -2,11 +2,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.mapper.quality.BizQualityTemplateMapper; import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.service.quality.IBizQualityTemplateService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板信息 服务实现类 @@ -17,5 +22,35 @@ */ @Service public class BizQualityTemplateServiceImpl extends ServiceImpl implements IBizQualityTemplateService { + private final AbstractPermissionContext permissionContext; + public BizQualityTemplateServiceImpl(AbstractPermissionContext permissionContext) { + this.permissionContext = permissionContext; + } + + @Override + public void saveList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + } + saveBatch(bizQualityTemplates); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + if (bizQualityTemplate.getId() != null) { + bizQualityTemplate.setCreateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplates); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java index 87f5378..7e2f28d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo; @@ -36,4 +37,6 @@ List list(MeasureInfoListRequest request) throws Exception; List measureInfoListByIds(List ids) throws Exception; + + ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java index 5b00b90..d87d86c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java @@ -1,12 +1,12 @@ package com.casic.missiles.service.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureItemInfo; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -32,4 +32,6 @@ List list(MeasureItemListRequest request) throws Exception; + ReturnDTO asTemplate(Long id); + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java new file mode 100644 index 0000000..43b7986 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface IBizEquipmentStandardCheckInfoEquipmentService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java index 7656054..4882611 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -29,4 +30,6 @@ List checkInfoListByIds(List ids); List list(CheckInfoListRequest request); + + ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java index 4b55df7..c4a1b9a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java @@ -50,7 +50,7 @@ List> lists = approvalOperateService.approvalLog(processId); if(!CollectionUtils.isEmpty(lists) && !CollectionUtils.isEmpty(lists.get(1))){ List approvalLogResponses = lists.get(1); - ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(1); + ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(0); String approver = approvalLogResponse.getAssigneeName(); goodsUseDetailMapper.updateByRecordId(id, approver); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java new file mode 100644 index 0000000..66e9f30 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java @@ -0,0 +1,23 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizLabRelDeptService extends IService { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage(Page page,QueryWrapper query); +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java new file mode 100644 index 0000000..4f0ca46 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityProcessRecordMapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityProcessRecordServiceImpl extends ServiceImpl implements IBizQualityProcessRecordService { + + @Override + public List selectBizQualityProcessRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityProcessRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java new file mode 100644 index 0000000..7722480 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + + @Override + public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityRepRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java new file mode 100644 index 0000000..3769fa1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -0,0 +1,75 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.enums.quality.QualityFileNoEnum; +import com.casic.missiles.enums.quality.QualityFileTypeEnum; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import com.casic.missiles.utils.NoGeneratorUtil; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService { + private final IBizLabRelDeptService relDeptService; + private final AbstractPermissionContext permissionContext; + + public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) { + this.relDeptService = relDeptService; + this.permissionContext = permissionContext; + } + + @Override + public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); + } + + @Override + public Long selectMaxNo(QueryWrapper query) { + return this.baseMapper.selectMaxNo(query); + } + + @Override + public List labList(QueryWrapper query) { + List deptList = relDeptService.list(query); + for (BizLabRelDept bizLabRelDept : deptList) { + bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId())); + } + return deptList; + } + + @Override + public boolean save(BizQualitySupervisionRecord entity) { + //生成文件编码 系统号类同 + //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号 + String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), 0l); + //检索最大编码 + String queryCode = code.substring(0, 15); + + QueryWrapper query = new QueryWrapper<>(); + query.like("file_code", queryCode); + Long maxNo = this.selectMaxNo(query); + String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), maxNo); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + + return super.save(entity); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java new file mode 100644 index 0000000..50fea02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -0,0 +1,29 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRepServiceImpl extends ServiceImpl implements IBizQualitySupervisionRepService { + @Override + public List selectBizQualitySupervisionRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRepPage(query, page); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index a730958..273a88b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -7,6 +7,9 @@ import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板项 服务实现类 @@ -18,4 +21,23 @@ @Service public class BizQualityTemplateItemServiceImpl extends ServiceImpl implements IBizQualityTemplateItemService { + @Override + public void saveList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(new Date()); + } + saveBatch(bizQualityTemplateItems); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + if (bizQualityTemplateItem.getId() != null) { + bizQualityTemplateItem.setUpdateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplateItems); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index 616c1c0..9e93d7f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -2,11 +2,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.mapper.quality.BizQualityTemplateMapper; import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.service.quality.IBizQualityTemplateService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板信息 服务实现类 @@ -17,5 +22,35 @@ */ @Service public class BizQualityTemplateServiceImpl extends ServiceImpl implements IBizQualityTemplateService { + private final AbstractPermissionContext permissionContext; + public BizQualityTemplateServiceImpl(AbstractPermissionContext permissionContext) { + this.permissionContext = permissionContext; + } + + @Override + public void saveList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + } + saveBatch(bizQualityTemplates); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + if (bizQualityTemplate.getId() != null) { + bizQualityTemplate.setCreateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplates); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java index 87f5378..7e2f28d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo; @@ -36,4 +37,6 @@ List list(MeasureInfoListRequest request) throws Exception; List measureInfoListByIds(List ids) throws Exception; + + ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java index 5b00b90..d87d86c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java @@ -1,12 +1,12 @@ package com.casic.missiles.service.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureItemInfo; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -32,4 +32,6 @@ List list(MeasureItemListRequest request) throws Exception; + ReturnDTO asTemplate(Long id); + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java new file mode 100644 index 0000000..43b7986 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface IBizEquipmentStandardCheckInfoEquipmentService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java index 7656054..4882611 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -29,4 +30,6 @@ List checkInfoListByIds(List ids); List list(CheckInfoListRequest request); + + ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java index 4b55df7..c4a1b9a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java @@ -50,7 +50,7 @@ List> lists = approvalOperateService.approvalLog(processId); if(!CollectionUtils.isEmpty(lists) && !CollectionUtils.isEmpty(lists.get(1))){ List approvalLogResponses = lists.get(1); - ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(1); + ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(0); String approver = approvalLogResponse.getAssigneeName(); goodsUseDetailMapper.updateByRecordId(id, approver); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java new file mode 100644 index 0000000..66e9f30 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java @@ -0,0 +1,23 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizLabRelDeptService extends IService { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage(Page page,QueryWrapper query); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java index a92fe43..8fd60da 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; /** @@ -14,4 +15,10 @@ */ public interface IBizQualityConferenceRelUserService extends IService { + /** + * 会议用户报存 + * + * @param dto 用户集合 + */ + void saveUsers(QualityUserDTO dto); } diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java new file mode 100644 index 0000000..4f0ca46 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityProcessRecordMapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityProcessRecordServiceImpl extends ServiceImpl implements IBizQualityProcessRecordService { + + @Override + public List selectBizQualityProcessRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityProcessRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java new file mode 100644 index 0000000..7722480 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + + @Override + public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityRepRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java new file mode 100644 index 0000000..3769fa1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -0,0 +1,75 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.enums.quality.QualityFileNoEnum; +import com.casic.missiles.enums.quality.QualityFileTypeEnum; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import com.casic.missiles.utils.NoGeneratorUtil; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService { + private final IBizLabRelDeptService relDeptService; + private final AbstractPermissionContext permissionContext; + + public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) { + this.relDeptService = relDeptService; + this.permissionContext = permissionContext; + } + + @Override + public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); + } + + @Override + public Long selectMaxNo(QueryWrapper query) { + return this.baseMapper.selectMaxNo(query); + } + + @Override + public List labList(QueryWrapper query) { + List deptList = relDeptService.list(query); + for (BizLabRelDept bizLabRelDept : deptList) { + bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId())); + } + return deptList; + } + + @Override + public boolean save(BizQualitySupervisionRecord entity) { + //生成文件编码 系统号类同 + //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号 + String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), 0l); + //检索最大编码 + String queryCode = code.substring(0, 15); + + QueryWrapper query = new QueryWrapper<>(); + query.like("file_code", queryCode); + Long maxNo = this.selectMaxNo(query); + String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), maxNo); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + + return super.save(entity); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java new file mode 100644 index 0000000..50fea02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -0,0 +1,29 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRepServiceImpl extends ServiceImpl implements IBizQualitySupervisionRepService { + @Override + public List selectBizQualitySupervisionRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRepPage(query, page); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index a730958..273a88b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -7,6 +7,9 @@ import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板项 服务实现类 @@ -18,4 +21,23 @@ @Service public class BizQualityTemplateItemServiceImpl extends ServiceImpl implements IBizQualityTemplateItemService { + @Override + public void saveList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(new Date()); + } + saveBatch(bizQualityTemplateItems); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + if (bizQualityTemplateItem.getId() != null) { + bizQualityTemplateItem.setUpdateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplateItems); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index 616c1c0..9e93d7f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -2,11 +2,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.mapper.quality.BizQualityTemplateMapper; import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.service.quality.IBizQualityTemplateService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板信息 服务实现类 @@ -17,5 +22,35 @@ */ @Service public class BizQualityTemplateServiceImpl extends ServiceImpl implements IBizQualityTemplateService { + private final AbstractPermissionContext permissionContext; + public BizQualityTemplateServiceImpl(AbstractPermissionContext permissionContext) { + this.permissionContext = permissionContext; + } + + @Override + public void saveList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + } + saveBatch(bizQualityTemplates); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + if (bizQualityTemplate.getId() != null) { + bizQualityTemplate.setCreateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplates); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java index 87f5378..7e2f28d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo; @@ -36,4 +37,6 @@ List list(MeasureInfoListRequest request) throws Exception; List measureInfoListByIds(List ids) throws Exception; + + ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java index 5b00b90..d87d86c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java @@ -1,12 +1,12 @@ package com.casic.missiles.service.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureItemInfo; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -32,4 +32,6 @@ List list(MeasureItemListRequest request) throws Exception; + ReturnDTO asTemplate(Long id); + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java new file mode 100644 index 0000000..43b7986 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface IBizEquipmentStandardCheckInfoEquipmentService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java index 7656054..4882611 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -29,4 +30,6 @@ List checkInfoListByIds(List ids); List list(CheckInfoListRequest request); + + ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java index 4b55df7..c4a1b9a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java @@ -50,7 +50,7 @@ List> lists = approvalOperateService.approvalLog(processId); if(!CollectionUtils.isEmpty(lists) && !CollectionUtils.isEmpty(lists.get(1))){ List approvalLogResponses = lists.get(1); - ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(1); + ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(0); String approver = approvalLogResponse.getAssigneeName(); goodsUseDetailMapper.updateByRecordId(id, approver); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java new file mode 100644 index 0000000..66e9f30 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java @@ -0,0 +1,23 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizLabRelDeptService extends IService { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage(Page page,QueryWrapper query); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java index a92fe43..8fd60da 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; /** @@ -14,4 +15,10 @@ */ public interface IBizQualityConferenceRelUserService extends IService { + /** + * 会议用户报存 + * + * @param dto 用户集合 + */ + void saveUsers(QualityUserDTO dto); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java new file mode 100644 index 0000000..cb60b02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityCorrectiveFileRelService extends IService { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(QueryWrapper query,Page page); +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java new file mode 100644 index 0000000..4f0ca46 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityProcessRecordMapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityProcessRecordServiceImpl extends ServiceImpl implements IBizQualityProcessRecordService { + + @Override + public List selectBizQualityProcessRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityProcessRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java new file mode 100644 index 0000000..7722480 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + + @Override + public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityRepRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java new file mode 100644 index 0000000..3769fa1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -0,0 +1,75 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.enums.quality.QualityFileNoEnum; +import com.casic.missiles.enums.quality.QualityFileTypeEnum; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import com.casic.missiles.utils.NoGeneratorUtil; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService { + private final IBizLabRelDeptService relDeptService; + private final AbstractPermissionContext permissionContext; + + public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) { + this.relDeptService = relDeptService; + this.permissionContext = permissionContext; + } + + @Override + public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); + } + + @Override + public Long selectMaxNo(QueryWrapper query) { + return this.baseMapper.selectMaxNo(query); + } + + @Override + public List labList(QueryWrapper query) { + List deptList = relDeptService.list(query); + for (BizLabRelDept bizLabRelDept : deptList) { + bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId())); + } + return deptList; + } + + @Override + public boolean save(BizQualitySupervisionRecord entity) { + //生成文件编码 系统号类同 + //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号 + String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), 0l); + //检索最大编码 + String queryCode = code.substring(0, 15); + + QueryWrapper query = new QueryWrapper<>(); + query.like("file_code", queryCode); + Long maxNo = this.selectMaxNo(query); + String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), maxNo); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + + return super.save(entity); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java new file mode 100644 index 0000000..50fea02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -0,0 +1,29 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRepServiceImpl extends ServiceImpl implements IBizQualitySupervisionRepService { + @Override + public List selectBizQualitySupervisionRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRepPage(query, page); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index a730958..273a88b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -7,6 +7,9 @@ import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板项 服务实现类 @@ -18,4 +21,23 @@ @Service public class BizQualityTemplateItemServiceImpl extends ServiceImpl implements IBizQualityTemplateItemService { + @Override + public void saveList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(new Date()); + } + saveBatch(bizQualityTemplateItems); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + if (bizQualityTemplateItem.getId() != null) { + bizQualityTemplateItem.setUpdateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplateItems); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index 616c1c0..9e93d7f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -2,11 +2,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.mapper.quality.BizQualityTemplateMapper; import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.service.quality.IBizQualityTemplateService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板信息 服务实现类 @@ -17,5 +22,35 @@ */ @Service public class BizQualityTemplateServiceImpl extends ServiceImpl implements IBizQualityTemplateService { + private final AbstractPermissionContext permissionContext; + public BizQualityTemplateServiceImpl(AbstractPermissionContext permissionContext) { + this.permissionContext = permissionContext; + } + + @Override + public void saveList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + } + saveBatch(bizQualityTemplates); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + if (bizQualityTemplate.getId() != null) { + bizQualityTemplate.setCreateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplates); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java index 87f5378..7e2f28d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo; @@ -36,4 +37,6 @@ List list(MeasureInfoListRequest request) throws Exception; List measureInfoListByIds(List ids) throws Exception; + + ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java index 5b00b90..d87d86c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java @@ -1,12 +1,12 @@ package com.casic.missiles.service.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureItemInfo; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -32,4 +32,6 @@ List list(MeasureItemListRequest request) throws Exception; + ReturnDTO asTemplate(Long id); + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java new file mode 100644 index 0000000..43b7986 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface IBizEquipmentStandardCheckInfoEquipmentService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java index 7656054..4882611 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -29,4 +30,6 @@ List checkInfoListByIds(List ids); List list(CheckInfoListRequest request); + + ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java index 4b55df7..c4a1b9a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java @@ -50,7 +50,7 @@ List> lists = approvalOperateService.approvalLog(processId); if(!CollectionUtils.isEmpty(lists) && !CollectionUtils.isEmpty(lists.get(1))){ List approvalLogResponses = lists.get(1); - ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(1); + ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(0); String approver = approvalLogResponse.getAssigneeName(); goodsUseDetailMapper.updateByRecordId(id, approver); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java new file mode 100644 index 0000000..66e9f30 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java @@ -0,0 +1,23 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizLabRelDeptService extends IService { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage(Page page,QueryWrapper query); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java index a92fe43..8fd60da 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; /** @@ -14,4 +15,10 @@ */ public interface IBizQualityConferenceRelUserService extends IService { + /** + * 会议用户报存 + * + * @param dto 用户集合 + */ + void saveUsers(QualityUserDTO dto); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java new file mode 100644 index 0000000..cb60b02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityCorrectiveFileRelService extends IService { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java new file mode 100644 index 0000000..be9f974 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityCorrectiveRecordService extends IService { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page); +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java new file mode 100644 index 0000000..4f0ca46 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityProcessRecordMapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityProcessRecordServiceImpl extends ServiceImpl implements IBizQualityProcessRecordService { + + @Override + public List selectBizQualityProcessRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityProcessRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java new file mode 100644 index 0000000..7722480 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + + @Override + public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityRepRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java new file mode 100644 index 0000000..3769fa1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -0,0 +1,75 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.enums.quality.QualityFileNoEnum; +import com.casic.missiles.enums.quality.QualityFileTypeEnum; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import com.casic.missiles.utils.NoGeneratorUtil; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService { + private final IBizLabRelDeptService relDeptService; + private final AbstractPermissionContext permissionContext; + + public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) { + this.relDeptService = relDeptService; + this.permissionContext = permissionContext; + } + + @Override + public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); + } + + @Override + public Long selectMaxNo(QueryWrapper query) { + return this.baseMapper.selectMaxNo(query); + } + + @Override + public List labList(QueryWrapper query) { + List deptList = relDeptService.list(query); + for (BizLabRelDept bizLabRelDept : deptList) { + bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId())); + } + return deptList; + } + + @Override + public boolean save(BizQualitySupervisionRecord entity) { + //生成文件编码 系统号类同 + //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号 + String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), 0l); + //检索最大编码 + String queryCode = code.substring(0, 15); + + QueryWrapper query = new QueryWrapper<>(); + query.like("file_code", queryCode); + Long maxNo = this.selectMaxNo(query); + String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), maxNo); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + + return super.save(entity); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java new file mode 100644 index 0000000..50fea02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -0,0 +1,29 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRepServiceImpl extends ServiceImpl implements IBizQualitySupervisionRepService { + @Override + public List selectBizQualitySupervisionRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRepPage(query, page); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index a730958..273a88b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -7,6 +7,9 @@ import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板项 服务实现类 @@ -18,4 +21,23 @@ @Service public class BizQualityTemplateItemServiceImpl extends ServiceImpl implements IBizQualityTemplateItemService { + @Override + public void saveList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(new Date()); + } + saveBatch(bizQualityTemplateItems); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + if (bizQualityTemplateItem.getId() != null) { + bizQualityTemplateItem.setUpdateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplateItems); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index 616c1c0..9e93d7f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -2,11 +2,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.mapper.quality.BizQualityTemplateMapper; import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.service.quality.IBizQualityTemplateService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板信息 服务实现类 @@ -17,5 +22,35 @@ */ @Service public class BizQualityTemplateServiceImpl extends ServiceImpl implements IBizQualityTemplateService { + private final AbstractPermissionContext permissionContext; + public BizQualityTemplateServiceImpl(AbstractPermissionContext permissionContext) { + this.permissionContext = permissionContext; + } + + @Override + public void saveList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + } + saveBatch(bizQualityTemplates); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + if (bizQualityTemplate.getId() != null) { + bizQualityTemplate.setCreateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplates); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java index 87f5378..7e2f28d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo; @@ -36,4 +37,6 @@ List list(MeasureInfoListRequest request) throws Exception; List measureInfoListByIds(List ids) throws Exception; + + ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java index 5b00b90..d87d86c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java @@ -1,12 +1,12 @@ package com.casic.missiles.service.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureItemInfo; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -32,4 +32,6 @@ List list(MeasureItemListRequest request) throws Exception; + ReturnDTO asTemplate(Long id); + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java new file mode 100644 index 0000000..43b7986 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface IBizEquipmentStandardCheckInfoEquipmentService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java index 7656054..4882611 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -29,4 +30,6 @@ List checkInfoListByIds(List ids); List list(CheckInfoListRequest request); + + ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java index 4b55df7..c4a1b9a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java @@ -50,7 +50,7 @@ List> lists = approvalOperateService.approvalLog(processId); if(!CollectionUtils.isEmpty(lists) && !CollectionUtils.isEmpty(lists.get(1))){ List approvalLogResponses = lists.get(1); - ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(1); + ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(0); String approver = approvalLogResponse.getAssigneeName(); goodsUseDetailMapper.updateByRecordId(id, approver); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java new file mode 100644 index 0000000..66e9f30 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java @@ -0,0 +1,23 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizLabRelDeptService extends IService { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage(Page page,QueryWrapper query); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java index a92fe43..8fd60da 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; /** @@ -14,4 +15,10 @@ */ public interface IBizQualityConferenceRelUserService extends IService { + /** + * 会议用户报存 + * + * @param dto 用户集合 + */ + void saveUsers(QualityUserDTO dto); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java new file mode 100644 index 0000000..cb60b02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityCorrectiveFileRelService extends IService { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java new file mode 100644 index 0000000..be9f974 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityCorrectiveRecordService extends IService { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java new file mode 100644 index 0000000..0deb82f --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityNonConformanceRepService extends IService { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(QueryWrapper query,Page page); +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java new file mode 100644 index 0000000..4f0ca46 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityProcessRecordMapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityProcessRecordServiceImpl extends ServiceImpl implements IBizQualityProcessRecordService { + + @Override + public List selectBizQualityProcessRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityProcessRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java new file mode 100644 index 0000000..7722480 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + + @Override + public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityRepRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java new file mode 100644 index 0000000..3769fa1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -0,0 +1,75 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.enums.quality.QualityFileNoEnum; +import com.casic.missiles.enums.quality.QualityFileTypeEnum; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import com.casic.missiles.utils.NoGeneratorUtil; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService { + private final IBizLabRelDeptService relDeptService; + private final AbstractPermissionContext permissionContext; + + public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) { + this.relDeptService = relDeptService; + this.permissionContext = permissionContext; + } + + @Override + public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); + } + + @Override + public Long selectMaxNo(QueryWrapper query) { + return this.baseMapper.selectMaxNo(query); + } + + @Override + public List labList(QueryWrapper query) { + List deptList = relDeptService.list(query); + for (BizLabRelDept bizLabRelDept : deptList) { + bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId())); + } + return deptList; + } + + @Override + public boolean save(BizQualitySupervisionRecord entity) { + //生成文件编码 系统号类同 + //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号 + String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), 0l); + //检索最大编码 + String queryCode = code.substring(0, 15); + + QueryWrapper query = new QueryWrapper<>(); + query.like("file_code", queryCode); + Long maxNo = this.selectMaxNo(query); + String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), maxNo); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + + return super.save(entity); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java new file mode 100644 index 0000000..50fea02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -0,0 +1,29 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRepServiceImpl extends ServiceImpl implements IBizQualitySupervisionRepService { + @Override + public List selectBizQualitySupervisionRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRepPage(query, page); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index a730958..273a88b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -7,6 +7,9 @@ import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板项 服务实现类 @@ -18,4 +21,23 @@ @Service public class BizQualityTemplateItemServiceImpl extends ServiceImpl implements IBizQualityTemplateItemService { + @Override + public void saveList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(new Date()); + } + saveBatch(bizQualityTemplateItems); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + if (bizQualityTemplateItem.getId() != null) { + bizQualityTemplateItem.setUpdateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplateItems); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index 616c1c0..9e93d7f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -2,11 +2,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.mapper.quality.BizQualityTemplateMapper; import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.service.quality.IBizQualityTemplateService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板信息 服务实现类 @@ -17,5 +22,35 @@ */ @Service public class BizQualityTemplateServiceImpl extends ServiceImpl implements IBizQualityTemplateService { + private final AbstractPermissionContext permissionContext; + public BizQualityTemplateServiceImpl(AbstractPermissionContext permissionContext) { + this.permissionContext = permissionContext; + } + + @Override + public void saveList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + } + saveBatch(bizQualityTemplates); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + if (bizQualityTemplate.getId() != null) { + bizQualityTemplate.setCreateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplates); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java index 87f5378..7e2f28d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo; @@ -36,4 +37,6 @@ List list(MeasureInfoListRequest request) throws Exception; List measureInfoListByIds(List ids) throws Exception; + + ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java index 5b00b90..d87d86c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java @@ -1,12 +1,12 @@ package com.casic.missiles.service.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureItemInfo; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -32,4 +32,6 @@ List list(MeasureItemListRequest request) throws Exception; + ReturnDTO asTemplate(Long id); + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java new file mode 100644 index 0000000..43b7986 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface IBizEquipmentStandardCheckInfoEquipmentService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java index 7656054..4882611 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -29,4 +30,6 @@ List checkInfoListByIds(List ids); List list(CheckInfoListRequest request); + + ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java index 4b55df7..c4a1b9a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java @@ -50,7 +50,7 @@ List> lists = approvalOperateService.approvalLog(processId); if(!CollectionUtils.isEmpty(lists) && !CollectionUtils.isEmpty(lists.get(1))){ List approvalLogResponses = lists.get(1); - ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(1); + ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(0); String approver = approvalLogResponse.getAssigneeName(); goodsUseDetailMapper.updateByRecordId(id, approver); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java new file mode 100644 index 0000000..66e9f30 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java @@ -0,0 +1,23 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizLabRelDeptService extends IService { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage(Page page,QueryWrapper query); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java index a92fe43..8fd60da 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; /** @@ -14,4 +15,10 @@ */ public interface IBizQualityConferenceRelUserService extends IService { + /** + * 会议用户报存 + * + * @param dto 用户集合 + */ + void saveUsers(QualityUserDTO dto); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java new file mode 100644 index 0000000..cb60b02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityCorrectiveFileRelService extends IService { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java new file mode 100644 index 0000000..be9f974 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityCorrectiveRecordService extends IService { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java new file mode 100644 index 0000000..0deb82f --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityNonConformanceRepService extends IService { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java new file mode 100644 index 0000000..806645b --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityPreventRecordService extends IService { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(QueryWrapper query,Page page); +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java new file mode 100644 index 0000000..4f0ca46 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityProcessRecordMapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityProcessRecordServiceImpl extends ServiceImpl implements IBizQualityProcessRecordService { + + @Override + public List selectBizQualityProcessRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityProcessRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java new file mode 100644 index 0000000..7722480 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + + @Override + public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityRepRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java new file mode 100644 index 0000000..3769fa1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -0,0 +1,75 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.enums.quality.QualityFileNoEnum; +import com.casic.missiles.enums.quality.QualityFileTypeEnum; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import com.casic.missiles.utils.NoGeneratorUtil; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService { + private final IBizLabRelDeptService relDeptService; + private final AbstractPermissionContext permissionContext; + + public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) { + this.relDeptService = relDeptService; + this.permissionContext = permissionContext; + } + + @Override + public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); + } + + @Override + public Long selectMaxNo(QueryWrapper query) { + return this.baseMapper.selectMaxNo(query); + } + + @Override + public List labList(QueryWrapper query) { + List deptList = relDeptService.list(query); + for (BizLabRelDept bizLabRelDept : deptList) { + bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId())); + } + return deptList; + } + + @Override + public boolean save(BizQualitySupervisionRecord entity) { + //生成文件编码 系统号类同 + //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号 + String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), 0l); + //检索最大编码 + String queryCode = code.substring(0, 15); + + QueryWrapper query = new QueryWrapper<>(); + query.like("file_code", queryCode); + Long maxNo = this.selectMaxNo(query); + String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), maxNo); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + + return super.save(entity); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java new file mode 100644 index 0000000..50fea02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -0,0 +1,29 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRepServiceImpl extends ServiceImpl implements IBizQualitySupervisionRepService { + @Override + public List selectBizQualitySupervisionRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRepPage(query, page); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index a730958..273a88b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -7,6 +7,9 @@ import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板项 服务实现类 @@ -18,4 +21,23 @@ @Service public class BizQualityTemplateItemServiceImpl extends ServiceImpl implements IBizQualityTemplateItemService { + @Override + public void saveList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(new Date()); + } + saveBatch(bizQualityTemplateItems); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + if (bizQualityTemplateItem.getId() != null) { + bizQualityTemplateItem.setUpdateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplateItems); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index 616c1c0..9e93d7f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -2,11 +2,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.mapper.quality.BizQualityTemplateMapper; import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.service.quality.IBizQualityTemplateService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板信息 服务实现类 @@ -17,5 +22,35 @@ */ @Service public class BizQualityTemplateServiceImpl extends ServiceImpl implements IBizQualityTemplateService { + private final AbstractPermissionContext permissionContext; + public BizQualityTemplateServiceImpl(AbstractPermissionContext permissionContext) { + this.permissionContext = permissionContext; + } + + @Override + public void saveList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + } + saveBatch(bizQualityTemplates); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + if (bizQualityTemplate.getId() != null) { + bizQualityTemplate.setCreateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplates); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java index 87f5378..7e2f28d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo; @@ -36,4 +37,6 @@ List list(MeasureInfoListRequest request) throws Exception; List measureInfoListByIds(List ids) throws Exception; + + ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java index 5b00b90..d87d86c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java @@ -1,12 +1,12 @@ package com.casic.missiles.service.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureItemInfo; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -32,4 +32,6 @@ List list(MeasureItemListRequest request) throws Exception; + ReturnDTO asTemplate(Long id); + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java new file mode 100644 index 0000000..43b7986 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface IBizEquipmentStandardCheckInfoEquipmentService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java index 7656054..4882611 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -29,4 +30,6 @@ List checkInfoListByIds(List ids); List list(CheckInfoListRequest request); + + ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java index 4b55df7..c4a1b9a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java @@ -50,7 +50,7 @@ List> lists = approvalOperateService.approvalLog(processId); if(!CollectionUtils.isEmpty(lists) && !CollectionUtils.isEmpty(lists.get(1))){ List approvalLogResponses = lists.get(1); - ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(1); + ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(0); String approver = approvalLogResponse.getAssigneeName(); goodsUseDetailMapper.updateByRecordId(id, approver); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java new file mode 100644 index 0000000..66e9f30 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java @@ -0,0 +1,23 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizLabRelDeptService extends IService { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage(Page page,QueryWrapper query); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java index a92fe43..8fd60da 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; /** @@ -14,4 +15,10 @@ */ public interface IBizQualityConferenceRelUserService extends IService { + /** + * 会议用户报存 + * + * @param dto 用户集合 + */ + void saveUsers(QualityUserDTO dto); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java new file mode 100644 index 0000000..cb60b02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityCorrectiveFileRelService extends IService { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java new file mode 100644 index 0000000..be9f974 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityCorrectiveRecordService extends IService { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java new file mode 100644 index 0000000..0deb82f --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityNonConformanceRepService extends IService { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java new file mode 100644 index 0000000..806645b --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityPreventRecordService extends IService { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityProcessRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityProcessRecordService.java new file mode 100644 index 0000000..02322ca --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityProcessRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityProcessRecordService extends IService { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(QueryWrapper query,Page page); +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java new file mode 100644 index 0000000..4f0ca46 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityProcessRecordMapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityProcessRecordServiceImpl extends ServiceImpl implements IBizQualityProcessRecordService { + + @Override + public List selectBizQualityProcessRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityProcessRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java new file mode 100644 index 0000000..7722480 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + + @Override + public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityRepRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java new file mode 100644 index 0000000..3769fa1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -0,0 +1,75 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.enums.quality.QualityFileNoEnum; +import com.casic.missiles.enums.quality.QualityFileTypeEnum; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import com.casic.missiles.utils.NoGeneratorUtil; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService { + private final IBizLabRelDeptService relDeptService; + private final AbstractPermissionContext permissionContext; + + public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) { + this.relDeptService = relDeptService; + this.permissionContext = permissionContext; + } + + @Override + public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); + } + + @Override + public Long selectMaxNo(QueryWrapper query) { + return this.baseMapper.selectMaxNo(query); + } + + @Override + public List labList(QueryWrapper query) { + List deptList = relDeptService.list(query); + for (BizLabRelDept bizLabRelDept : deptList) { + bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId())); + } + return deptList; + } + + @Override + public boolean save(BizQualitySupervisionRecord entity) { + //生成文件编码 系统号类同 + //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号 + String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), 0l); + //检索最大编码 + String queryCode = code.substring(0, 15); + + QueryWrapper query = new QueryWrapper<>(); + query.like("file_code", queryCode); + Long maxNo = this.selectMaxNo(query); + String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), maxNo); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + + return super.save(entity); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java new file mode 100644 index 0000000..50fea02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -0,0 +1,29 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRepServiceImpl extends ServiceImpl implements IBizQualitySupervisionRepService { + @Override + public List selectBizQualitySupervisionRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRepPage(query, page); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index a730958..273a88b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -7,6 +7,9 @@ import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板项 服务实现类 @@ -18,4 +21,23 @@ @Service public class BizQualityTemplateItemServiceImpl extends ServiceImpl implements IBizQualityTemplateItemService { + @Override + public void saveList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(new Date()); + } + saveBatch(bizQualityTemplateItems); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + if (bizQualityTemplateItem.getId() != null) { + bizQualityTemplateItem.setUpdateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplateItems); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index 616c1c0..9e93d7f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -2,11 +2,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.mapper.quality.BizQualityTemplateMapper; import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.service.quality.IBizQualityTemplateService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板信息 服务实现类 @@ -17,5 +22,35 @@ */ @Service public class BizQualityTemplateServiceImpl extends ServiceImpl implements IBizQualityTemplateService { + private final AbstractPermissionContext permissionContext; + public BizQualityTemplateServiceImpl(AbstractPermissionContext permissionContext) { + this.permissionContext = permissionContext; + } + + @Override + public void saveList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + } + saveBatch(bizQualityTemplates); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + if (bizQualityTemplate.getId() != null) { + bizQualityTemplate.setCreateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplates); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java index 87f5378..7e2f28d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo; @@ -36,4 +37,6 @@ List list(MeasureInfoListRequest request) throws Exception; List measureInfoListByIds(List ids) throws Exception; + + ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java index 5b00b90..d87d86c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java @@ -1,12 +1,12 @@ package com.casic.missiles.service.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureItemInfo; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -32,4 +32,6 @@ List list(MeasureItemListRequest request) throws Exception; + ReturnDTO asTemplate(Long id); + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java new file mode 100644 index 0000000..43b7986 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface IBizEquipmentStandardCheckInfoEquipmentService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java index 7656054..4882611 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -29,4 +30,6 @@ List checkInfoListByIds(List ids); List list(CheckInfoListRequest request); + + ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java index 4b55df7..c4a1b9a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java @@ -50,7 +50,7 @@ List> lists = approvalOperateService.approvalLog(processId); if(!CollectionUtils.isEmpty(lists) && !CollectionUtils.isEmpty(lists.get(1))){ List approvalLogResponses = lists.get(1); - ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(1); + ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(0); String approver = approvalLogResponse.getAssigneeName(); goodsUseDetailMapper.updateByRecordId(id, approver); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java new file mode 100644 index 0000000..66e9f30 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java @@ -0,0 +1,23 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizLabRelDeptService extends IService { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage(Page page,QueryWrapper query); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java index a92fe43..8fd60da 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; /** @@ -14,4 +15,10 @@ */ public interface IBizQualityConferenceRelUserService extends IService { + /** + * 会议用户报存 + * + * @param dto 用户集合 + */ + void saveUsers(QualityUserDTO dto); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java new file mode 100644 index 0000000..cb60b02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityCorrectiveFileRelService extends IService { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java new file mode 100644 index 0000000..be9f974 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityCorrectiveRecordService extends IService { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java new file mode 100644 index 0000000..0deb82f --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityNonConformanceRepService extends IService { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java new file mode 100644 index 0000000..806645b --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityPreventRecordService extends IService { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityProcessRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityProcessRecordService.java new file mode 100644 index 0000000..02322ca --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityProcessRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityProcessRecordService extends IService { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityRepRelService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityRepRelService.java new file mode 100644 index 0000000..fb7d90c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityRepRelService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityRepRel; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityRepRelService extends IService { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(QueryWrapper query,Page page); +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java new file mode 100644 index 0000000..4f0ca46 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityProcessRecordMapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityProcessRecordServiceImpl extends ServiceImpl implements IBizQualityProcessRecordService { + + @Override + public List selectBizQualityProcessRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityProcessRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java new file mode 100644 index 0000000..7722480 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + + @Override + public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityRepRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java new file mode 100644 index 0000000..3769fa1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -0,0 +1,75 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.enums.quality.QualityFileNoEnum; +import com.casic.missiles.enums.quality.QualityFileTypeEnum; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import com.casic.missiles.utils.NoGeneratorUtil; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService { + private final IBizLabRelDeptService relDeptService; + private final AbstractPermissionContext permissionContext; + + public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) { + this.relDeptService = relDeptService; + this.permissionContext = permissionContext; + } + + @Override + public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); + } + + @Override + public Long selectMaxNo(QueryWrapper query) { + return this.baseMapper.selectMaxNo(query); + } + + @Override + public List labList(QueryWrapper query) { + List deptList = relDeptService.list(query); + for (BizLabRelDept bizLabRelDept : deptList) { + bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId())); + } + return deptList; + } + + @Override + public boolean save(BizQualitySupervisionRecord entity) { + //生成文件编码 系统号类同 + //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号 + String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), 0l); + //检索最大编码 + String queryCode = code.substring(0, 15); + + QueryWrapper query = new QueryWrapper<>(); + query.like("file_code", queryCode); + Long maxNo = this.selectMaxNo(query); + String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), maxNo); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + + return super.save(entity); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java new file mode 100644 index 0000000..50fea02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -0,0 +1,29 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRepServiceImpl extends ServiceImpl implements IBizQualitySupervisionRepService { + @Override + public List selectBizQualitySupervisionRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRepPage(query, page); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index a730958..273a88b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -7,6 +7,9 @@ import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板项 服务实现类 @@ -18,4 +21,23 @@ @Service public class BizQualityTemplateItemServiceImpl extends ServiceImpl implements IBizQualityTemplateItemService { + @Override + public void saveList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(new Date()); + } + saveBatch(bizQualityTemplateItems); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + if (bizQualityTemplateItem.getId() != null) { + bizQualityTemplateItem.setUpdateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplateItems); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index 616c1c0..9e93d7f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -2,11 +2,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.mapper.quality.BizQualityTemplateMapper; import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.service.quality.IBizQualityTemplateService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板信息 服务实现类 @@ -17,5 +22,35 @@ */ @Service public class BizQualityTemplateServiceImpl extends ServiceImpl implements IBizQualityTemplateService { + private final AbstractPermissionContext permissionContext; + public BizQualityTemplateServiceImpl(AbstractPermissionContext permissionContext) { + this.permissionContext = permissionContext; + } + + @Override + public void saveList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + } + saveBatch(bizQualityTemplates); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + if (bizQualityTemplate.getId() != null) { + bizQualityTemplate.setCreateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplates); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java index 87f5378..7e2f28d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo; @@ -36,4 +37,6 @@ List list(MeasureInfoListRequest request) throws Exception; List measureInfoListByIds(List ids) throws Exception; + + ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java index 5b00b90..d87d86c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java @@ -1,12 +1,12 @@ package com.casic.missiles.service.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureItemInfo; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -32,4 +32,6 @@ List list(MeasureItemListRequest request) throws Exception; + ReturnDTO asTemplate(Long id); + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java new file mode 100644 index 0000000..43b7986 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface IBizEquipmentStandardCheckInfoEquipmentService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java index 7656054..4882611 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -29,4 +30,6 @@ List checkInfoListByIds(List ids); List list(CheckInfoListRequest request); + + ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java index 4b55df7..c4a1b9a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java @@ -50,7 +50,7 @@ List> lists = approvalOperateService.approvalLog(processId); if(!CollectionUtils.isEmpty(lists) && !CollectionUtils.isEmpty(lists.get(1))){ List approvalLogResponses = lists.get(1); - ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(1); + ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(0); String approver = approvalLogResponse.getAssigneeName(); goodsUseDetailMapper.updateByRecordId(id, approver); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java new file mode 100644 index 0000000..66e9f30 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java @@ -0,0 +1,23 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizLabRelDeptService extends IService { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage(Page page,QueryWrapper query); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java index a92fe43..8fd60da 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; /** @@ -14,4 +15,10 @@ */ public interface IBizQualityConferenceRelUserService extends IService { + /** + * 会议用户报存 + * + * @param dto 用户集合 + */ + void saveUsers(QualityUserDTO dto); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java new file mode 100644 index 0000000..cb60b02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityCorrectiveFileRelService extends IService { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java new file mode 100644 index 0000000..be9f974 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityCorrectiveRecordService extends IService { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java new file mode 100644 index 0000000..0deb82f --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityNonConformanceRepService extends IService { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java new file mode 100644 index 0000000..806645b --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityPreventRecordService extends IService { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityProcessRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityProcessRecordService.java new file mode 100644 index 0000000..02322ca --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityProcessRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityProcessRecordService extends IService { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityRepRelService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityRepRelService.java new file mode 100644 index 0000000..fb7d90c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityRepRelService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityRepRel; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityRepRelService extends IService { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java new file mode 100644 index 0000000..513bf8f --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java @@ -0,0 +1,35 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualitySupervisionRecordService extends IService { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(QueryWrapper query); + + List labList(QueryWrapper query); +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java new file mode 100644 index 0000000..4f0ca46 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityProcessRecordMapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityProcessRecordServiceImpl extends ServiceImpl implements IBizQualityProcessRecordService { + + @Override + public List selectBizQualityProcessRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityProcessRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java new file mode 100644 index 0000000..7722480 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + + @Override + public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityRepRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java new file mode 100644 index 0000000..3769fa1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -0,0 +1,75 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.enums.quality.QualityFileNoEnum; +import com.casic.missiles.enums.quality.QualityFileTypeEnum; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import com.casic.missiles.utils.NoGeneratorUtil; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService { + private final IBizLabRelDeptService relDeptService; + private final AbstractPermissionContext permissionContext; + + public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) { + this.relDeptService = relDeptService; + this.permissionContext = permissionContext; + } + + @Override + public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); + } + + @Override + public Long selectMaxNo(QueryWrapper query) { + return this.baseMapper.selectMaxNo(query); + } + + @Override + public List labList(QueryWrapper query) { + List deptList = relDeptService.list(query); + for (BizLabRelDept bizLabRelDept : deptList) { + bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId())); + } + return deptList; + } + + @Override + public boolean save(BizQualitySupervisionRecord entity) { + //生成文件编码 系统号类同 + //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号 + String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), 0l); + //检索最大编码 + String queryCode = code.substring(0, 15); + + QueryWrapper query = new QueryWrapper<>(); + query.like("file_code", queryCode); + Long maxNo = this.selectMaxNo(query); + String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), maxNo); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + + return super.save(entity); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java new file mode 100644 index 0000000..50fea02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -0,0 +1,29 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRepServiceImpl extends ServiceImpl implements IBizQualitySupervisionRepService { + @Override + public List selectBizQualitySupervisionRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRepPage(query, page); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index a730958..273a88b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -7,6 +7,9 @@ import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板项 服务实现类 @@ -18,4 +21,23 @@ @Service public class BizQualityTemplateItemServiceImpl extends ServiceImpl implements IBizQualityTemplateItemService { + @Override + public void saveList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(new Date()); + } + saveBatch(bizQualityTemplateItems); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + if (bizQualityTemplateItem.getId() != null) { + bizQualityTemplateItem.setUpdateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplateItems); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index 616c1c0..9e93d7f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -2,11 +2,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.mapper.quality.BizQualityTemplateMapper; import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.service.quality.IBizQualityTemplateService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板信息 服务实现类 @@ -17,5 +22,35 @@ */ @Service public class BizQualityTemplateServiceImpl extends ServiceImpl implements IBizQualityTemplateService { + private final AbstractPermissionContext permissionContext; + public BizQualityTemplateServiceImpl(AbstractPermissionContext permissionContext) { + this.permissionContext = permissionContext; + } + + @Override + public void saveList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + } + saveBatch(bizQualityTemplates); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + if (bizQualityTemplate.getId() != null) { + bizQualityTemplate.setCreateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplates); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java index 87f5378..7e2f28d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo; @@ -36,4 +37,6 @@ List list(MeasureInfoListRequest request) throws Exception; List measureInfoListByIds(List ids) throws Exception; + + ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java index 5b00b90..d87d86c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java @@ -1,12 +1,12 @@ package com.casic.missiles.service.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureItemInfo; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -32,4 +32,6 @@ List list(MeasureItemListRequest request) throws Exception; + ReturnDTO asTemplate(Long id); + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java new file mode 100644 index 0000000..43b7986 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface IBizEquipmentStandardCheckInfoEquipmentService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java index 7656054..4882611 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -29,4 +30,6 @@ List checkInfoListByIds(List ids); List list(CheckInfoListRequest request); + + ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java index 4b55df7..c4a1b9a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java @@ -50,7 +50,7 @@ List> lists = approvalOperateService.approvalLog(processId); if(!CollectionUtils.isEmpty(lists) && !CollectionUtils.isEmpty(lists.get(1))){ List approvalLogResponses = lists.get(1); - ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(1); + ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(0); String approver = approvalLogResponse.getAssigneeName(); goodsUseDetailMapper.updateByRecordId(id, approver); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java new file mode 100644 index 0000000..66e9f30 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java @@ -0,0 +1,23 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizLabRelDeptService extends IService { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage(Page page,QueryWrapper query); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java index a92fe43..8fd60da 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; /** @@ -14,4 +15,10 @@ */ public interface IBizQualityConferenceRelUserService extends IService { + /** + * 会议用户报存 + * + * @param dto 用户集合 + */ + void saveUsers(QualityUserDTO dto); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java new file mode 100644 index 0000000..cb60b02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityCorrectiveFileRelService extends IService { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java new file mode 100644 index 0000000..be9f974 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityCorrectiveRecordService extends IService { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java new file mode 100644 index 0000000..0deb82f --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityNonConformanceRepService extends IService { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java new file mode 100644 index 0000000..806645b --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityPreventRecordService extends IService { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityProcessRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityProcessRecordService.java new file mode 100644 index 0000000..02322ca --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityProcessRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityProcessRecordService extends IService { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityRepRelService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityRepRelService.java new file mode 100644 index 0000000..fb7d90c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityRepRelService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityRepRel; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityRepRelService extends IService { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java new file mode 100644 index 0000000..513bf8f --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java @@ -0,0 +1,35 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualitySupervisionRecordService extends IService { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(QueryWrapper query); + + List labList(QueryWrapper query); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRepService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRepService.java new file mode 100644 index 0000000..be74488 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRepService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; + +import java.util.List; + + +/** + *

+ * 质量监督报告 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualitySupervisionRepService extends IService { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(QueryWrapper query, Page page); +} diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java new file mode 100644 index 0000000..4f0ca46 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityProcessRecordMapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityProcessRecordServiceImpl extends ServiceImpl implements IBizQualityProcessRecordService { + + @Override + public List selectBizQualityProcessRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityProcessRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java new file mode 100644 index 0000000..7722480 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + + @Override + public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityRepRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java new file mode 100644 index 0000000..3769fa1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -0,0 +1,75 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.enums.quality.QualityFileNoEnum; +import com.casic.missiles.enums.quality.QualityFileTypeEnum; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import com.casic.missiles.utils.NoGeneratorUtil; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService { + private final IBizLabRelDeptService relDeptService; + private final AbstractPermissionContext permissionContext; + + public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) { + this.relDeptService = relDeptService; + this.permissionContext = permissionContext; + } + + @Override + public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); + } + + @Override + public Long selectMaxNo(QueryWrapper query) { + return this.baseMapper.selectMaxNo(query); + } + + @Override + public List labList(QueryWrapper query) { + List deptList = relDeptService.list(query); + for (BizLabRelDept bizLabRelDept : deptList) { + bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId())); + } + return deptList; + } + + @Override + public boolean save(BizQualitySupervisionRecord entity) { + //生成文件编码 系统号类同 + //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号 + String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), 0l); + //检索最大编码 + String queryCode = code.substring(0, 15); + + QueryWrapper query = new QueryWrapper<>(); + query.like("file_code", queryCode); + Long maxNo = this.selectMaxNo(query); + String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), maxNo); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + + return super.save(entity); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java new file mode 100644 index 0000000..50fea02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -0,0 +1,29 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRepServiceImpl extends ServiceImpl implements IBizQualitySupervisionRepService { + @Override + public List selectBizQualitySupervisionRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRepPage(query, page); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index a730958..273a88b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -7,6 +7,9 @@ import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板项 服务实现类 @@ -18,4 +21,23 @@ @Service public class BizQualityTemplateItemServiceImpl extends ServiceImpl implements IBizQualityTemplateItemService { + @Override + public void saveList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(new Date()); + } + saveBatch(bizQualityTemplateItems); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + if (bizQualityTemplateItem.getId() != null) { + bizQualityTemplateItem.setUpdateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplateItems); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index 616c1c0..9e93d7f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -2,11 +2,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.mapper.quality.BizQualityTemplateMapper; import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.service.quality.IBizQualityTemplateService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板信息 服务实现类 @@ -17,5 +22,35 @@ */ @Service public class BizQualityTemplateServiceImpl extends ServiceImpl implements IBizQualityTemplateService { + private final AbstractPermissionContext permissionContext; + public BizQualityTemplateServiceImpl(AbstractPermissionContext permissionContext) { + this.permissionContext = permissionContext; + } + + @Override + public void saveList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + } + saveBatch(bizQualityTemplates); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + if (bizQualityTemplate.getId() != null) { + bizQualityTemplate.setCreateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplates); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java index 87f5378..7e2f28d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo; @@ -36,4 +37,6 @@ List list(MeasureInfoListRequest request) throws Exception; List measureInfoListByIds(List ids) throws Exception; + + ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java index 5b00b90..d87d86c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java @@ -1,12 +1,12 @@ package com.casic.missiles.service.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureItemInfo; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -32,4 +32,6 @@ List list(MeasureItemListRequest request) throws Exception; + ReturnDTO asTemplate(Long id); + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java new file mode 100644 index 0000000..43b7986 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface IBizEquipmentStandardCheckInfoEquipmentService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java index 7656054..4882611 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -29,4 +30,6 @@ List checkInfoListByIds(List ids); List list(CheckInfoListRequest request); + + ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java index 4b55df7..c4a1b9a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java @@ -50,7 +50,7 @@ List> lists = approvalOperateService.approvalLog(processId); if(!CollectionUtils.isEmpty(lists) && !CollectionUtils.isEmpty(lists.get(1))){ List approvalLogResponses = lists.get(1); - ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(1); + ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(0); String approver = approvalLogResponse.getAssigneeName(); goodsUseDetailMapper.updateByRecordId(id, approver); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java new file mode 100644 index 0000000..66e9f30 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java @@ -0,0 +1,23 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizLabRelDeptService extends IService { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage(Page page,QueryWrapper query); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java index a92fe43..8fd60da 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; /** @@ -14,4 +15,10 @@ */ public interface IBizQualityConferenceRelUserService extends IService { + /** + * 会议用户报存 + * + * @param dto 用户集合 + */ + void saveUsers(QualityUserDTO dto); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java new file mode 100644 index 0000000..cb60b02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityCorrectiveFileRelService extends IService { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java new file mode 100644 index 0000000..be9f974 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityCorrectiveRecordService extends IService { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java new file mode 100644 index 0000000..0deb82f --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityNonConformanceRepService extends IService { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java new file mode 100644 index 0000000..806645b --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityPreventRecordService extends IService { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityProcessRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityProcessRecordService.java new file mode 100644 index 0000000..02322ca --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityProcessRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityProcessRecordService extends IService { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityRepRelService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityRepRelService.java new file mode 100644 index 0000000..fb7d90c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityRepRelService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityRepRel; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityRepRelService extends IService { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java new file mode 100644 index 0000000..513bf8f --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java @@ -0,0 +1,35 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualitySupervisionRecordService extends IService { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(QueryWrapper query); + + List labList(QueryWrapper query); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRepService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRepService.java new file mode 100644 index 0000000..be74488 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRepService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; + +import java.util.List; + + +/** + *

+ * 质量监督报告 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualitySupervisionRepService extends IService { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(QueryWrapper query, Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityTemplateItemService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityTemplateItemService.java index e32d9bb..6effcb3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityTemplateItemService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityTemplateItemService.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.model.quality.BizQualityTemplateItem; +import java.util.List; + /** *

@@ -14,4 +16,11 @@ */ public interface IBizQualityTemplateItemService extends IService { + /** + * 保存列表 + * @param bizQualityTemplateItems + */ + void saveList(List bizQualityTemplateItems); + + void saveOrUpdateList(List bizQualityTemplateItems); } diff --git "a/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" new file mode 100644 index 0000000..1da524a --- /dev/null +++ "b/X\050DD\051\345\255\2272013002\346\240\241\345\207\206\350\257\201\344\271\246_1697801421601.pdf" Binary files differ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java index b1466d1..c3541bb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java @@ -7,6 +7,8 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.deviceMeasure.DeviceMeasureInfoResponse; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.enums.ExportEnum; @@ -50,7 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") - public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { + public ReturnDTO addMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureInfo measureInfo) { return measureInfoService.addMeasureInfo(measureInfo); } @@ -93,4 +95,15 @@ super.exportExcel(BizBusinessDeviceMeasureInfo.class, list, ExportEnum.MEASURE_INFO.getSheetName()); } + /** + * 生成结果处理按钮，所有检定数据计算功能处理 + * 全局检定数据处理流程： + * 前端回填检定项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid MeasureInfoCalculateHandleRequest request) { + return measureInfoService.calculateHandle(request); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java index 7440780..369ac7c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java @@ -4,6 +4,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; @@ -101,4 +102,10 @@ return ReturnUtil.success(modelInfoService.listEquipmentName()); } + @ApiOperation("检定项数据存为模板(入参为itemId)") + @PostMapping("/asTemplate") + public ReturnDTO asTemplate(@RequestBody @Valid IdDTO idDTO) { + return measureItemInfoService.asTemplate(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java index a3fa042..56a21ed 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; @@ -74,4 +75,15 @@ } super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName()); } + + /** + * 生成结果处理按钮，所有核查数据计算功能处理 + * 全局核查数据处理流程： + * 前端回填核查项数据-->用户手填或编辑数据-->生成结果处理(计算)-->数据保存 + */ + @ApiOperation("生成结果处理") + @PostMapping("/calculateHandle") + public ReturnDTO calculateHandle(@RequestBody @Valid CheckInfoCalculateHandleRequest request) { + return checkInfoService.calculateHandle(request); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index 81b3e98..1180442 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -109,6 +109,16 @@ } /** + * 通知参会人员-待定 + */ + @ApiOperation("通知参会人员-待完善") + @GetMapping(value = "/pushUsers") + public ReturnDTO pushUsers(@ApiParam("会议ID") String id) { + + return ReturnUtil.success(); + } + + /** * 修改质量活动模板管理 */ @ApiOperation("修改接口") @@ -138,14 +148,14 @@ */ @ApiOperation("会议编号查询接口") @GetMapping(value = "/fileCode") - public ReturnDTO fileCode() { + public ReturnDTO fileCode() { return ReturnUtil.success(PrefixCodeEnum.quality_conference_no + IdWorker.getId()); } /** * 关联工作查询接口 */ - @ApiOperation("关联工作查询接口") + @ApiOperation("关联工作查询接口-待完善") @GetMapping(value = "/relWork") public ReturnDTO relWork(@ApiParam("关联类型(字典quality_work_type)") String type) { List qualitySelectDTOS = bizQualityConferenceRecordService.relWork(type); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java index 636dda4..56be9ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRelUserController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import io.swagger.annotations.Api; @@ -70,8 +71,8 @@ */ @ApiOperation("添加接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityConferenceRelUser bizQualityConferenceRelUser) { - bizQualityConferenceRelUserService.save(bizQualityConferenceRelUser); + public ReturnDTO add(@RequestBody QualityUserDTO dto) { + bizQualityConferenceRelUserService.saveUsers(dto); return ReturnUtil.success(); } @@ -100,4 +101,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualityConferenceRelUserService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java new file mode 100644 index 0000000..73b76a9 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveFileRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.dto.quality.BizQualityCorrectiveFileRelVO; + +/** + * 纠正措施处理单关联文件Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单关联文件") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveFileRel") +public class BizQualityCorrectiveFileRelController extends BaseController { + + private final IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService; + public BizQualityCorrectiveFileRelController(IBizQualityCorrectiveFileRelService bizQualityCorrectiveFileRelService) { + this.bizQualityCorrectiveFileRelService = bizQualityCorrectiveFileRelService; + } + + /** + * 纠正措施处理单关联文件列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveFileRelService.list(query)); + } + + /** + * 纠正措施处理单关联文件分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveFileRelVO bizQualityCorrectiveFileRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveFileRelVO.genQuery(); + page = bizQualityCorrectiveFileRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单关联文件 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.save(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单关联文件 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveFileRel bizQualityCorrectiveFileRel) { + bizQualityCorrectiveFileRelService.updateById(bizQualityCorrectiveFileRel); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单关联文件 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveFileRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单关联文件详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveFileRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java new file mode 100644 index 0000000..846419d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityCorrectiveRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.dto.quality.BizQualityCorrectiveRecordVO; + +/** + * 纠正措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "纠正措施处理单") +@RestController +@RequestMapping("/quality/bizQualityCorrectiveRecord") +public class BizQualityCorrectiveRecordController extends BaseController { + + private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; + public BizQualityCorrectiveRecordController(IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService) { + this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; + } + + /** + * 纠正措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + return ReturnUtil.success(bizQualityCorrectiveRecordService.list(query)); + } + + /** + * 纠正措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityCorrectiveRecordVO bizQualityCorrectiveRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityCorrectiveRecordVO.genQuery(); + page = bizQualityCorrectiveRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增纠正措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.save(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 修改纠正措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityCorrectiveRecord bizQualityCorrectiveRecord) { + bizQualityCorrectiveRecordService.updateById(bizQualityCorrectiveRecord); + return ReturnUtil.success(); + } + + /** + * 删除纠正措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityCorrectiveRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 纠正措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityCorrectiveRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java new file mode 100644 index 0000000..c99649c --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityNonConformanceRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; + +/** + * 质量活动不符合情况分析报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动不符合情况分析报告") +@RestController +@RequestMapping("/quality/bizQualityNonConformanceRep") +public class BizQualityNonConformanceRepController extends BaseController { + + private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + public BizQualityNonConformanceRepController(IBizQualityNonConformanceRepService bizQualityNonConformanceRepService) { + this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; + } + + /** + * 质量活动不符合情况分析报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + return ReturnUtil.success(bizQualityNonConformanceRepService.list(query)); + } + + /** + * 质量活动不符合情况分析报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityNonConformanceRepVO bizQualityNonConformanceRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityNonConformanceRepVO.genQuery(); + page = bizQualityNonConformanceRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动不符合情况分析报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.save(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 修改质量活动不符合情况分析报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityNonConformanceRep bizQualityNonConformanceRep) { + bizQualityNonConformanceRepService.updateById(bizQualityNonConformanceRep); + return ReturnUtil.success(); + } + + /** + * 删除质量活动不符合情况分析报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityNonConformanceRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动不符合情况分析报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityNonConformanceRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java new file mode 100644 index 0000000..cfc5ed6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; + +/** + * 预防措施处理单Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "预防措施处理单") +@RestController +@RequestMapping("/quality/bizQualityPreventRecord") +public class BizQualityPreventRecordController extends BaseController { + + private final IBizQualityPreventRecordService bizQualityPreventRecordService; + public BizQualityPreventRecordController(IBizQualityPreventRecordService bizQualityPreventRecordService) { + this.bizQualityPreventRecordService = bizQualityPreventRecordService; + } + + /** + * 预防措施处理单列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + return ReturnUtil.success(bizQualityPreventRecordService.list(query)); + } + + /** + * 预防措施处理单分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityPreventRecordVO bizQualityPreventRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityPreventRecordVO.genQuery(); + page = bizQualityPreventRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增预防措施处理单 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.save(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 修改预防措施处理单 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityPreventRecord bizQualityPreventRecord) { + bizQualityPreventRecordService.updateById(bizQualityPreventRecord); + return ReturnUtil.success(); + } + + /** + * 删除预防措施处理单 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityPreventRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 预防措施处理单详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityPreventRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java new file mode 100644 index 0000000..35ac2dc --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityProcessRecordController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.dto.quality.BizQualityProcessRecordVO; + +/** + * 质量活动监督记录过程记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录过程记录") +@RestController +@RequestMapping("/quality/bizQualityProcessRecord") +public class BizQualityProcessRecordController extends BaseController { + + private final IBizQualityProcessRecordService bizQualityProcessRecordService; + public BizQualityProcessRecordController(IBizQualityProcessRecordService bizQualityProcessRecordService) { + this.bizQualityProcessRecordService = bizQualityProcessRecordService; + } + + /** + * 质量活动监督记录过程记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + return ReturnUtil.success(bizQualityProcessRecordService.list(query)); + } + + /** + * 质量活动监督记录过程记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityProcessRecordVO bizQualityProcessRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityProcessRecordVO.genQuery(); + page = bizQualityProcessRecordService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录过程记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.save(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录过程记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityProcessRecord bizQualityProcessRecord) { + bizQualityProcessRecordService.updateById(bizQualityProcessRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录过程记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityProcessRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录过程记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityProcessRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java new file mode 100644 index 0000000..cc66696 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityRepRelController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.core.page.PageInfoBT; +import java.util.List; + +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.dto.quality.BizQualityRepRelVO; + +/** + * 质量监督报告关联监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告关联监督记录") +@RestController +@RequestMapping("/quality/bizQualityRepRel") +public class BizQualityRepRelController extends BaseController { + + private final IBizQualityRepRelService bizQualityRepRelService; + public BizQualityRepRelController(IBizQualityRepRelService bizQualityRepRelService) { + this.bizQualityRepRelService = bizQualityRepRelService; + } + + /** + * 质量监督报告关联监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualityRepRelVO bizQualityRepRelVO) { + QueryWrapper query = bizQualityRepRelVO.genQuery(); + return ReturnUtil.success(bizQualityRepRelService.list(query)); + } + + /** + * 质量监督报告关联监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualityRepRelVO bizQualityRepRelVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualityRepRelVO.genQuery(); + page = bizQualityRepRelService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告关联监督记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.save(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告关联监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualityRepRel bizQualityRepRel) { + bizQualityRepRelService.updateById(bizQualityRepRel); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告关联监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualityRepRelService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告关联监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualityRepRelService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java new file mode 100644 index 0000000..1c9d5a3 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -0,0 +1,129 @@ +package com.casic.missiles.controller.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO; +import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 质量活动监督记录Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量活动监督记录") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRecord") +public class BizQualitySupervisionRecordController extends BaseController { + + private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService; + private final AbstractPermissionContext permissionContext; + + + public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) { + this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService; + this.permissionContext = permissionContext; + + } + + /** + * 质量活动监督记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRecordService.list(query)); + } + + /** + * 部门选择接口 + */ + @ApiOperation("部门选择列表查询") + @GetMapping(value = "/deptList") + public ReturnDTO> labList(String labCode) { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) { + query.eq("biz_lab_code", labCode); + } + return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query)); + } + + /** + * 质量活动监督记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRecordVO bizQualitySupervisionRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRecordVO.genQuery(); + List recordList = bizQualitySupervisionRecordService.selectBizQualitySupervisionRecordPage(query, page); + page.setRecords(recordList); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量活动监督记录 + */ + @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + AuthUser user = permissionContext.getAuthService().getLoginUser(); + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecord.setCreateTime(new Date()); + bizQualitySupervisionRecord.setCreator(user.getId()); + bizQualitySupervisionRecord.setCreateName(user.getName()); + bizQualitySupervisionRecord.setStatus(0); + + bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 修改质量活动监督记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) { + bizQualitySupervisionRecord.setUpdateTime(new Date()); + bizQualitySupervisionRecordService.updateById(bizQualitySupervisionRecord); + return ReturnUtil.success(); + } + + /** + * 删除质量活动监督记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRecordService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量活动监督记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRecordService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java new file mode 100644 index 0000000..bf4b5d6 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -0,0 +1,96 @@ +package com.casic.missiles.controller.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 质量监督报告Controller + * + * @author lwh + * @date 2023-10-21 + */ +@Api(tags = "质量监督报告") +@RestController +@RequestMapping("/quality/bizQualitySupervisionRep") +public class BizQualitySupervisionRepController extends BaseController { + + private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; + + public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { + this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + } + + /** + * 质量监督报告列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ReturnDTO> list(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + return ReturnUtil.success(bizQualitySupervisionRepService.list(query)); + } + + /** + * 质量监督报告分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ReturnDTO> listPage(BizQualitySupervisionRepVO bizQualitySupervisionRepVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = bizQualitySupervisionRepVO.genQuery(); + page = bizQualitySupervisionRepService.page(page, query); + return ReturnUtil.success(super.packForBT(page)); + } + + /** + * 新增质量监督报告 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ReturnDTO add(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.save(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 修改质量监督报告 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ReturnDTO update(@RequestBody BizQualitySupervisionRep bizQualitySupervisionRep) { + bizQualitySupervisionRepService.updateById(bizQualitySupervisionRep); + return ReturnUtil.success(); + } + + /** + * 删除质量监督报告 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ReturnDTO delete(String id) { + bizQualitySupervisionRepService.removeById(id); + return ReturnUtil.success(); + } + + /** + * 质量监督报告详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ReturnDTO detail(String id) { + return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java index 633c769..639199c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; @@ -17,8 +16,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import java.util.Date; - /** * 质量活动模板管理控制器 @@ -71,12 +68,6 @@ @ApiOperation("模板添加") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) { - - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.save(bizQualityTemplate); return ReturnUtil.success(); } @@ -98,10 +89,6 @@ @ApiOperation("模板修改") @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) { - bizQualityTemplate.setUpdateTime(new Date()); - AuthUser authUser = permissionContext.getAuthService().getLoginUser(); - bizQualityTemplate.setUpdateId(authUser.getId()); - bizQualityTemplate.setUpdateName(authUser.getName()); bizQualityTemplateService.updateById(bizQualityTemplate); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java index c16f721..1ffebdd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.model.quality.BizQualityTemplateItem; import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 质量模板明细控制器 @@ -60,16 +62,8 @@ */ @ApiOperation("新增接口") @PostMapping(value = "/add") - public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); - - //模板不能为空 - Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> { - throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL); - }); - bizQualityTemplateItemService.save(bizQualityTemplateItem); - + public ReturnDTO add(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveList(bizQualityTemplateItems); return ReturnUtil.success(); } @@ -89,9 +83,8 @@ */ @ApiOperation("修改接口") @PostMapping(value = "/update") - public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) { - bizQualityTemplateItem.setUpdateTime(new Date()); - bizQualityTemplateItemService.updateById(bizQualityTemplateItem); + public ReturnDTO update(@RequestBody List bizQualityTemplateItems) { + bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems); return ReturnUtil.success(); } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index a9107db..ba9cc74 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_equipment_standard_check_modify_record + table-name: biz_equipment_standard_check_info_equipment reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java new file mode 100644 index 0000000..c56562f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileNoEnum.java @@ -0,0 +1,27 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量监督文件编号代码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileNoEnum { + TYPE_206("206", "质量监督"); + + private String code; + private String value; + + QualityFileNoEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java new file mode 100644 index 0000000..0eac5ee --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityFileTypeEnum.java @@ -0,0 +1,29 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 质量活动记录分类识别码 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityFileTypeEnum { + TYPE_01("01", "质量监督记录"), + TYPE_02("02", "质量监督报告"), + TYPE_03("03", "不符合要求情况分析报告"); + + private String code; + private String value; + + QualityFileTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java index 924f46e..d5b3453 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CasicBeanUtil.java @@ -56,7 +56,6 @@ } if ((beforeValue != null && !"".equals(beforeValue) && !beforeValue.equals(afterValue)) || ((beforeValue == null || "".equals(beforeValue)) && afterValue != null && !"".equals(afterValue))) { //属性 从 原始值 修改为 更新值 - // TODO: 2023/10/2 beforeFields[i].getName()需要获取对应的中文名 ApiModelProperty[] annotationsByType = beforeFields[i].getAnnotationsByType(ApiModelProperty.class); String value = annotationsByType[0].value(); changeList.add(dataDesc + " " + value + " 从 " + beforeValue + " 修改为 " + afterValue); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index 865b34e..dd18086 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -25,4 +25,6 @@ String customTemplateUrl(@Param("templateName") String templateName, @Param("coverModuleName") String coverModuleName, @Param("descn") String descn); + + BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java new file mode 100644 index 0000000..38062c6 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardCheckInfoEquipmentMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface BizEquipmentStandardCheckInfoEquipmentMapper extends BaseMapper { + + List selectListByDataId(@Param("dataId") Long dataId); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java new file mode 100644 index 0000000..f748495 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizLabRelDeptMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 业务编码关联组织机构 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage( @Param("page") Page page,@Param("qw" ) QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java index 03be6a5..a50b683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityConferenceRecordMapper.java @@ -1,9 +1,12 @@ package com.casic.missiles.mapper.quality; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.model.quality.BizQualityConferenceRecord; + /** *

* 质量活动会议纪要 Mapper 接口 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java new file mode 100644 index 0000000..5d92f49 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveFileRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单关联文件 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveFileRelMapper extends BaseMapper { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java new file mode 100644 index 0000000..e3a17bc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityCorrectiveRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 纠正措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityCorrectiveRecordMapper extends BaseMapper { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java new file mode 100644 index 0000000..e73049b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动不符合情况分析报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityNonConformanceRepMapper extends BaseMapper { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java new file mode 100644 index 0000000..154b652 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityPreventRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 预防措施处理单 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityPreventRecordMapper extends BaseMapper { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java new file mode 100644 index 0000000..1f3d9ad --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityProcessRecordMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量活动监督记录过程记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityProcessRecordMapper extends BaseMapper { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java new file mode 100644 index 0000000..1bb4d84 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityRepRelMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualityRepRel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告关联监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualityRepRelMapper extends BaseMapper { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(@Param("qw" ) QueryWrapper query, @Param("page" ) Page page); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java new file mode 100644 index 0000000..a46805c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRecordMapper.java @@ -0,0 +1,33 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 质量活动监督记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRecordMapper extends BaseMapper { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(@Param("qw") QueryWrapper query, @Param("page") Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(@Param("qw") QueryWrapper query); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java new file mode 100644 index 0000000..1834e61 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +/** + *

+ * 质量监督报告 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizQualitySupervisionRepMapper extends BaseMapper { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(@Param("qw") QueryWrapper query, @Param("page") Page page); +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 3c409ae..e947853 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -4,56 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, item_id, trace_date, measure_valid_date, + id, data_no, measure_category, order_id, sample_id, sample_name, model, manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, measure_address, temperature, humidity, data_source, appearance_function_check, conclusion, restriction_instruction, create_user_id, ipri, ipri_unit, isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, measure_person_id, create_user_name, create_time, update_time + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index 1288167..d34528e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -15,6 +15,7 @@ + @@ -22,7 +23,7 @@ id, device_model_id, device_type, belong_standard_equipment, help_field_instruction, item_category_id, item_category_name, data_sync, - sync_time, appearance_function_check, item_remark, create_time, update_time + sync_time, appearance_function_check, item_remark, as_template, create_time, update_time + SELECT bei.* + FROM biz_equipment_standard_check_info_equipment bescie + JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id + WHERE bescie.data_id = #{dataId} + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index e326278..2b28a12 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -11,8 +11,7 @@ - - + @@ -24,7 +23,7 @@ - id, data_no, check_date, check_address, temperature, humidity, check_accord, conclusion, check_equipment_id, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + id, data_no, check_date, check_address, temperature, humidity, check_accord, stability_examine, standard_equipment_id, equipment_id, item_category_id, create_user_id, create_user_name, create_time, update_time + select + a.id , + a.biz_lab_code as bizLabCode, + a.dept_id as deptId,a.group_no as groupNo + from biz_lab_rel_dept a + + + ${qw.sqlSegment} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml new file mode 100644 index 0000000..fd4b4d2 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveFileRelMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + file_type as fileType , + target_id as targetId , + corrective_id as correctiveId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml new file mode 100644 index 0000000..1da7ed7 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml new file mode 100644 index 0000000..ce6075f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + super_record_id as superRecordId , + problem + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml new file mode 100644 index 0000000..3cd22ab --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + non_conformance_id as nonConformanceId , + description + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml new file mode 100644 index 0000000..229875b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityProcessRecordMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + creator , + process_info as processInfo , + opt_facts as optFacts , + super_record_id as superRecordId , + temp_id as tempId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml new file mode 100644 index 0000000..828b0fc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityRepRelMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + id , + sup_record_id as supRecordId , + rep_id as repId + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml new file mode 100644 index 0000000..541ea19 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRecordMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + is_non_conformance as isNonConformance , + description , + standard , + status , + supervision_time as supervisionTime , + create_name as createName + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml new file mode 100644 index 0000000..b22a3f4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id , + create_time as createTime , + update_time as updateTime , + biz_lab_code as bizLabCode , + dept_id as deptId , + sys_code as sysCode , + file_code as fileCode , + file_name as fileName , + creator , + approval_status as approvalStatus , + process_id as processId , + process_info as processInfo , + better_process_desc as betterProcessDesc , + problem_process_desc as problemProcessDesc + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java new file mode 100644 index 0000000..32a419c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/DeviceMeasureInfoResponse.java @@ -0,0 +1,18 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/21 15:12 + */ +@Data +public class DeviceMeasureInfoResponse { + @ApiModelProperty(value = "主键id", dataType = "String") + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String dataNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java new file mode 100644 index 0000000..a116dd0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business.deviceMeasure; + +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 16:25 + */ +@Data +public class MeasureInfoCalculateHandleRequest { + @ApiModelProperty(value = "检定项分类名称", dataType = "String") + private String itemCategoryName; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "检定数据-多功能校准源", dataType = "List") + private List measureDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java index 0c53ff5..27be0c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoDetailRequest.java @@ -3,8 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @Description: * @Author: wangpeng @@ -12,10 +10,20 @@ */ @Data public class MeasureInfoDetailRequest { - @NotNull(message = "主键ID不能为空") +// @NotNull(message = "主键ID不能为空") @ApiModelProperty(value = "主键id", dataType = "Long", required = true) private Long id; @ApiModelProperty(value = "所属检校标准装置(字典code)", dataType = "String") private String belongStandardEquipment; + + //以下3项可唯一确定一条检定数据 + @ApiModelProperty(value = "任务单id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "受检设备id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "设备检定项表id", dataType = "Long") + private Long itemId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java index 39d373e..cbe46b3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemListRequest.java @@ -24,9 +24,15 @@ @ApiModelProperty("辅助字段") private String helpInstruction; - @ApiModelProperty("设备检定项分类表id") + @ApiModelProperty(value = "辅助字段说明") + private String helpFieldInstruction; + + @ApiModelProperty("设备检定项分类表id(查询引用模板时该字段必传)") private Long itemCategoryId; + @ApiModelProperty(value = "是否为模板(查询引用模板时该字段必传1)", dataType = "Integer") + private Integer asTemplate; + @ApiModelProperty(value = "设备分类(字典code)", dataType = "String") private String deviceType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index 9c9134b..ace545d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -42,6 +42,12 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty("生产厂家") + private String manufacturer; + + @ApiModelProperty("检定周期(月)") + private Integer checkCycle; + @ExcelProperty(value = "辅助字段", order = 4) @ApiModelProperty(value = "辅助字段", dataType = "String") private String helpInstruction; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java new file mode 100644 index 0000000..9284506 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CheckInfoCalculateHandleRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.dto.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/10/20 17:09 + */ +@Data +public class CheckInfoCalculateHandleRequest { + @NotNull(message = "核查项分类id不能为空") + @ApiModelProperty(value = "核查项分类id", dataType = "Long") + private Long itemCategoryId; + + @ApiModelProperty(value = "检校标准装置", dataType = "String") + private String belongStandardEquipment; + + @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") + @TableField(exist = false) + private List checkDataCalibratorList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java index 92d1d29..f97155a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StandardEquipmentListResponse.java @@ -27,6 +27,9 @@ @ApiModelProperty(value = "型号规格", dataType = "String") private String model; + @ApiModelProperty(value = "检定有效期", dataType = "String") + private String measureValidDate; + @ApiModelProperty(value = "技术指标", dataType = "List") private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java new file mode 100644 index 0000000..74356e1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizLabRelDeptVO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizLabRelDeptVO { + private static final long serialVersionUID = 1L; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值" , dataType = "String") + private String bizLabCode; + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID" , dataType = "Long") + private Long deptId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (deptId != null) { + query.eq("dept_id" , deptId); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java new file mode 100644 index 0000000..ba69b38 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveFileRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import lombok.Data; + + +/** + * 纠正措施处理单关联文件对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveFileRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java new file mode 100644 index 0000000..aa0d2cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityCorrectiveRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import lombok.Data; + + +/** + * 纠正措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityCorrectiveRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java new file mode 100644 index 0000000..7246a67 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityNonConformanceRepVO.java @@ -0,0 +1,105 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量活动不符合情况分析报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityNonConformanceRepVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + private String sysCode; + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + private String fileCode; + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + private String fileName; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + private String approvalStatus; + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + private String processId; + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + private Long superRecordId; + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + private String problem; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (StrUtil.isNotEmpty(sysCode)) { + query.eq("sys_code" , sysCode); + } + if (StrUtil.isNotEmpty(fileCode)) { + query.eq("file_code" , fileCode); + } + if (StrUtil.isNotEmpty(fileName)) { + query.like("file_name" , fileName); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (StrUtil.isNotEmpty(approvalStatus)) { + query.eq("approval_status" , approvalStatus); + } + if (StrUtil.isNotEmpty(processId)) { + query.eq("process_id" , processId); + } + if (superRecordId != null) { + query.eq("super_record_id" , superRecordId); + } + if (StrUtil.isNotEmpty(problem)) { + query.eq("problem" , problem); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java new file mode 100644 index 0000000..4baa976 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityPreventRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + + +/** + * 预防措施处理单对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityPreventRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java new file mode 100644 index 0000000..74efad1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityProcessRecordVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import lombok.Data; + + +/** + * 质量活动监督记录过程记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityProcessRecordVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java new file mode 100644 index 0000000..8911b3c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityRepRelVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualityRepRelVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java new file mode 100644 index 0000000..774098e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRecordVO.java @@ -0,0 +1,70 @@ +package com.casic.missiles.dto.quality; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + private String bizLabCode; + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + private String deptId; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + private Long creator; + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)" , dataType = "Integer") + private Integer isNonConformance; + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间起始" , dataType = "Date") + private Date supervisionTimeStart; + @ApiModelProperty(value = "监督时间结束" , dataType = "Date") + private Date supervisionTimeEnd; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(bizLabCode)) { + query.eq("biz_lab_code" , bizLabCode); + } + if (StrUtil.isNotEmpty(deptId)) { + query.eq("dept_id" , deptId); + } + if (creator != null) { + query.eq("creator" , creator); + } + if (supervisionTimeStart != null) { + query.ge("supervision_time" , supervisionTimeStart); + } + if (supervisionTimeEnd != null) { + query.le("supervision_time" , supervisionTimeEnd); + } + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java new file mode 100644 index 0000000..81ae656 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualitySupervisionRepVO.java @@ -0,0 +1,23 @@ +package com.casic.missiles.dto.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import lombok.Data; + + +/** + * 质量监督报告对象VO + * + * @author lwh + * @date 2023-10-21 + */ +@Data +public class BizQualitySupervisionRepVO { + private static final long serialVersionUID = 1L; + + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + return query; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java index d6a4201..09a7963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualitySelectDTO.java @@ -5,7 +5,7 @@ @Data public class QualitySelectDTO { - @ApiModelProperty(value = "关联源数据", dataType = "Object") + @ApiModelProperty(value = "关联源数据") private T target; @ApiModelProperty(value = "名称", dataType = "String") private String name; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java new file mode 100644 index 0000000..c932389 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.quality; + +import com.casic.missiles.modular.system.dto.UserDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 会议用户 + */ +@Data +public class QualityUserDTO { + /** + * 会议ID + */ + @ApiModelProperty(value = "会议ID", dataType = "Long") + private Long id; + /** + * 用户集合 + */ + @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") + private List userIds; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index baee96b..941ec1a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -17,8 +17,8 @@ import com.google.common.base.Joiner; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -65,7 +65,6 @@ @TableField(exist = false) private String measureCategoryName; - /** * 任务单id */ @@ -74,6 +73,10 @@ @TableField("order_id") private Long orderId; + @ApiModelProperty(value = "任务单编号", dataType = "String") + @TableField(exist = false) + private String orderNo; + /** * 受检设备id */ @@ -109,11 +112,11 @@ @TableField("manufacture_no") private String manufactureNo; - @ApiModelProperty(value = "制造厂家", dataType = "String") +// @NotEmpty(message = "生产厂家不能为空") + @ApiModelProperty("生产厂家") @TableField("manufacturer") private String manufacturer; - /** * 设备检定项表id */ @@ -166,6 +169,13 @@ @TableField("data_source") private String dataSource = "计量业务系统"; + public String getDataSource() { + if(StringUtils.isEmpty(dataSource)){ + return "计量业务系统"; + } + return dataSource; + } + /** * 外观及功能性检查 */ @@ -251,11 +261,6 @@ @TableField(exist = false) private String customerName; - - @ApiModelProperty("委托地址") - @TableField(exist = false) - private String customerAddress; - @ExcelProperty(value = "辅助字段", order = 8) @ApiModelProperty("辅助字段(新增不用传)") @TableField(exist = false) @@ -277,7 +282,7 @@ private String equipmentNameStr; public String getEquipmentNameStr() { - if (!CollectionUtils.isEmpty(equipmentNameList)) { + if(!CollectionUtils.isEmpty(equipmentNameList)){ return Joiner.on(",").join(equipmentNameList); } return equipmentNameStr; @@ -293,7 +298,7 @@ private String equipmentModelStr; public String getEquipmentModelStr() { - if (!CollectionUtils.isEmpty(equipmentModelList)) { + if(!CollectionUtils.isEmpty(equipmentModelList)){ return Joiner.on(",").join(equipmentModelList); } return equipmentModelStr; @@ -309,12 +314,21 @@ private String equipmentManufactureNoStr; public String getEquipmentManufactureNoStr() { - if (!CollectionUtils.isEmpty(equipmentManufactureNoList)) { + if(!CollectionUtils.isEmpty(equipmentManufactureNoList)){ return Joiner.on(",").join(equipmentManufactureNoList); } return equipmentManufactureNoStr; } + @ApiModelProperty(value = "检校标准装置(字典code)", dataType = "String") + @DictCodeField(message = "检校标准装置描述不合法", cacheName = MeterDictCode.BIZ_STANDARD_EQUIPMENT_TYPE) + @TableField(exist = false) + private String belongStandardEquipment; + + @ApiModelProperty(value = "检校标准装置(字典value)", dataType = "String") + @TableField(exist = false) + private String belongStandardEquipmentName; + @NotEmpty(message = "所使用的标准、主要测量设备不能为空") @ApiModelProperty(value = "所使用的标准、主要测量设备（新增/更新参数）", dataType = "List") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index 0fe1dd0..22b72af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -155,6 +155,10 @@ @TableField("item_remark") private String itemRemark; + @ApiModelProperty(value = "是否为模板", dataType = "Integer") + @TableField("as_template") + private Integer asTemplate = 0; + /** * 创建时间 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 4c74600..d5c9963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; @@ -85,18 +86,11 @@ private String checkAccord; /** - * 结论(直接存字典value) + * 是否用于稳定性考核 */ - @ApiModelProperty(value = "结论(直接存字典value)", dataType = "String") - @TableField("conclusion") - private String conclusion; - - /** - * 核查标准设备id(作为标准的) - */ - @ApiModelProperty(value = "核查标准设备id(作为标准的)", dataType = "String") - @TableField("check_equipment_id") - private String checkEquipmentId; + @ApiModelProperty(value = "是否用于稳定性考核(1/0)", dataType = "String") + @TableField("stability_examine") + private String stabilityExamine; /** * 被核查标准装置id @@ -148,6 +142,11 @@ @TableField("update_time") private String updateTime; + @NotEmpty(message = "核查标准设备id列表不能为空") + @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List") + @TableField(exist = false) + private List checkEquipmentIdList; + @ExcelProperty(value = "被核查标准装置名称", order = 3) @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String") @TableField(exist = false) @@ -183,6 +182,6 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private BizEquipmentInfo checkEquipmentInfo; + private List checkEquipmentList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java new file mode 100644 index 0000000..323ae0e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfoEquipment.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.equipment; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Data +@TableName("biz_equipment_standard_check_info_equipment") +public class BizEquipmentStandardCheckInfoEquipment implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 做核查标准设备id + */ + @TableField("check_equipment_id") + private Long checkEquipmentId; + + /** + * 核查数据基本信息表id + */ + @TableField("data_id") + private Long dataId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java new file mode 100644 index 0000000..ca25514 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java @@ -0,0 +1,60 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 业务编码关联组织机构对象 biz_lab_rel_dept + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_lab_rel_dept") +public class BizLabRelDept extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 部门字典值 + */ + @ApiModelProperty(value = "部门字典值", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 组织机构ID + */ + @ApiModelProperty(value = "组织机构ID", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty(value = "组织机构名称", dataType = "Long") + @TableField(exist = false) + private String deptName; + /** + * 组别代码 + */ + @ApiModelProperty(value = "组别代码", dataType = "Long") + @TableField("group_no") + private String groupNo; + + @Override + public String toString() { + return "BizLabRelDept{" + + "id=" + id + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index cd6e360..6937668 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.quality.QualityUserDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,6 +96,7 @@ /** * 会议内容 */ + @ApiModelProperty(value = "内容", dataType = "String") private String contents; /** @@ -105,6 +107,10 @@ @TableField("log_time") private Date logTime; + @ApiModelProperty(value = "参会人员") + @TableField(exist = false) + private QualityUserDTO qualityUserDto; + @Override public String toString() { return "BizQualityConferenceRecord{" + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java new file mode 100644 index 0000000..6b8f40c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单关联文件对象 biz_quality_corrective_file_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_file_rel") +public class BizQualityCorrectiveFileRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 关联文件类型 + */ + @ApiModelProperty(value = "关联文件类型" , dataType = "Long") + @TableField("file_type") + private Long fileType; + + /** + * 目标ID + */ + @ApiModelProperty(value = "目标ID" , dataType = "Long") + @TableField("target_id") + private Long targetId; + + /** + * 纠正措施单 + */ + @ApiModelProperty(value = "纠正措施单" , dataType = "Long") + @TableField("corrective_id") + private Long correctiveId; + + + @Override + public String toString() { + return "BizQualityCorrectiveFileRel{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "fileType=" + fileType + + "targetId=" + targetId + + "correctiveId=" + correctiveId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java new file mode 100644 index 0000000..fb49b44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 纠正措施处理单对象 biz_quality_corrective_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_corrective_record") +public class BizQualityCorrectiveRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 事实陈述 + */ + @ApiModelProperty(value = "事实陈述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityCorrectiveRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java new file mode 100644 index 0000000..7fee67b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动不符合情况分析报告对象 biz_quality_non_conformance_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_non_conformance_rep") +public class BizQualityNonConformanceRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 质检记录ID + */ + @ApiModelProperty(value = "质检记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 所发现问题 + */ + @ApiModelProperty(value = "所发现问题" , dataType = "String") + @TableField("problem") + private String problem; + + + @Override + public String toString() { + return "BizQualityNonConformanceRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "superRecordId=" + superRecordId + + "problem=" + problem + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java new file mode 100644 index 0000000..6265482 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -0,0 +1,133 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 预防措施处理单对象 biz_quality_prevent_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_prevent_record") +public class BizQualityPreventRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 不符合要求分析报告 + */ + @ApiModelProperty(value = "不符合要求分析报告" , dataType = "Long") + @TableField("non_conformance_id") + private Long nonConformanceId; + + /** + * 潜在不符合要求事实描述 + */ + @ApiModelProperty(value = "潜在不符合要求事实描述" , dataType = "String") + @TableField("description") + private String description; + + + @Override + public String toString() { + return "BizQualityPreventRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "nonConformanceId=" + nonConformanceId + + "description=" + description + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java new file mode 100644 index 0000000..4c641ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -0,0 +1,93 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量活动监督记录过程记录对象 biz_quality_process_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_process_record") +public class BizQualityProcessRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 监督的过程 + */ + @ApiModelProperty(value = "监督的过程" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行事实 + */ + @ApiModelProperty(value = "运行事实" , dataType = "String") + @TableField("opt_facts") + private String optFacts; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("super_record_id") + private Long superRecordId; + + /** + * 模板ID + */ + @ApiModelProperty(value = "模板ID" , dataType = "Long") + @TableField("temp_id") + private Long tempId; + + + @Override + public String toString() { + return "BizQualityProcessRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "creator=" + creator + + "processInfo=" + processInfo + + "optFacts=" + optFacts + + "superRecordId=" + superRecordId + + "tempId=" + tempId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java new file mode 100644 index 0000000..95b8034 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRepRel.java @@ -0,0 +1,51 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 质量监督报告关联监督记录对象 biz_quality_rep_rel + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_rep_rel") +public class BizQualityRepRel extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 监督记录ID + */ + @ApiModelProperty(value = "监督记录ID" , dataType = "Long") + @TableField("sup_record_id") + private Long supRecordId; + + /** + * 报告ID + */ + @ApiModelProperty(value = "报告ID" , dataType = "Long") + @TableField("rep_id") + private Long repId; + + + @Override + public String toString() { + return "BizQualityRepRel{" + + "id=" + id + + "supRecordId=" + supRecordId + + "repId=" + repId + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java new file mode 100644 index 0000000..0c4d423 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRecord.java @@ -0,0 +1,155 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 质量活动监督记录对象 biz_quality_supervision_record + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_record") +public class BizQualitySupervisionRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室", dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码", dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)", dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + /** + * 类别代码 + */ + @ApiModelProperty(value = "类别代码", dataType = "String") + @TableField("group_no") + private String groupNo; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者", dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 是否包含不符合项(0 不包含 1 包含) + */ + @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") + @TableField("is_non_conformance") + private Integer isNonConformance; + + /** + * 不符合情况说明 + */ + @ApiModelProperty(value = "不符合情况说明", dataType = "String") + @TableField("description") + private String description; + + /** + * 不符合标准 + */ + @ApiModelProperty(value = "不符合标准", dataType = "String") + @TableField("standard") + private String standard; + + /** + * 状态(0,草稿 1公开) + */ + @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") + @TableField("status") + private Integer status; + + /** + * 监督时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "监督时间", dataType = "Date") + @TableField("supervision_time") + private Date supervisionTime; + + /** + * 创建者名称 + */ + @ApiModelProperty(value = "创建者名称", dataType = "String") + @TableField("create_name") + private String createName; + + + @Override + public String toString() { + return "BizQualitySupervisionRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "isNonConformance=" + isNonConformance + + "description=" + description + + "standard=" + standard + + "status=" + status + + "supervisionTime=" + supervisionTime + + "createName=" + createName + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java new file mode 100644 index 0000000..dfd99ff --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.quality; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 质量监督报告对象 biz_quality_supervision_rep + * + * @author lwh + * @date 2023-10-21 + */ +@Data +@TableName("biz_quality_supervision_rep") +public class BizQualitySupervisionRep extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键" , dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间" , dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间" , dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 实验室代码A:全站:0;X:西昌:1;H:海口:2 + */ + @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2" , dataType = "String") + @TableField("biz_lab_code") + private String bizLabCode; + + /** + * 被监督实验室 + */ + @ApiModelProperty(value = "被监督实验室" , dataType = "String") + @TableField("dept_id") + private String deptId; + + /** + * 系统编码 + */ + @ApiModelProperty(value = "系统编码" , dataType = "String") + @TableField("sys_code") + private String sysCode; + + /** + * 文件编号(默认同编码) + */ + @ApiModelProperty(value = "文件编号(默认同编码)" , dataType = "String") + @TableField("file_code") + private String fileCode; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称" , dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者" , dataType = "Long") + @TableField("creator") + private Long creator; + + /** + * 审批状态 + */ + @ApiModelProperty(value = "审批状态" , dataType = "String") + @TableField("approval_status") + private String approvalStatus; + + /** + * 流程实例ID + */ + @ApiModelProperty(value = "流程实例ID" , dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 监督过程统计 + */ + @ApiModelProperty(value = "监督过程统计" , dataType = "String") + @TableField("process_info") + private String processInfo; + + /** + * 运行情况较好过程综述 + */ + @ApiModelProperty(value = "运行情况较好过程综述" , dataType = "String") + @TableField("better_process_desc") + private String betterProcessDesc; + + /** + * 问题过程综述 + */ + @ApiModelProperty(value = "问题过程综述" , dataType = "String") + @TableField("problem_process_desc") + private String problemProcessDesc; + + + @Override + public String toString() { + return "BizQualitySupervisionRep{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "bizLabCode=" + bizLabCode + + "deptId=" + deptId + + "sysCode=" + sysCode + + "fileCode=" + fileCode + + "fileName=" + fileName + + "creator=" + creator + + "approvalStatus=" + approvalStatus + + "processId=" + processId + + "processInfo=" + processInfo + + "betterProcessDesc=" + betterProcessDesc + + "problemProcessDesc=" + problemProcessDesc + + "}"; + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index d07f9d5..06a0ed1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -10,9 +10,7 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; -import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; +import com.casic.missiles.dto.business.deviceMeasure.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -35,7 +33,6 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import com.google.common.base.Joiner; -import liquibase.pro.packaged.A; import org.apache.commons.lang3.StringUtils; import org.docx4j.wml.R; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -109,6 +107,9 @@ measureInfo.setDataNo(dataNo); AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaffInfo = getMeterStaffInfo(user); + if(Objects.isNull(meterStaffInfo)){ + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + } measureInfo.setMeasurePersonId(meterStaffInfo.getId()); measureInfo.setCreateUserId(measureInfo.getUserId()); measureInfo.setCreateUserName(measureInfo.getUserName()); @@ -126,7 +127,10 @@ } //保存修改记录 saveMeasureModifyRecord(measureInfo, "新建"); - return ReturnUtil.success(); + DeviceMeasureInfoResponse response = new DeviceMeasureInfoResponse(); + response.setId(measureInfo.getId()); + response.setDataNo(dataNo); + return ReturnUtil.success(response); } private BizResourceStaffInfo getMeterStaffInfo(AuthUser user) { @@ -166,7 +170,15 @@ @Override public ReturnDTO detail(MeasureInfoDetailRequest request) throws Exception { - BizBusinessDeviceMeasureInfo measureInfo = this.baseMapper.selectDetailById(request.getId()); + BizBusinessDeviceMeasureInfo measureInfo; + if(Objects.nonNull(request.getId())){ + measureInfo = this.baseMapper.selectDetailById(request.getId()); + }else { + measureInfo = this.baseMapper.selectDetailByItemId(request.getItemId(), request.getOrderId(), request.getSampleId()); + } + if(Objects.isNull(measureInfo)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } DictCodeUtils.convertDictCodeToName(measureInfo); queryByStandardEquipmentTypeHandle(measureInfo, request.getBelongStandardEquipment()); Long dataId = measureInfo.getId(); @@ -328,6 +340,69 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request) { + switch (request.getBelongStandardEquipment()) { + //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 + case CALIBRATOR: + List measureDataList = request.getMeasureDataCalibratorList(); + //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 + //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 + List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); + List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); + List threeList = Arrays.asList("多功能电力参数测量仪"); + List fourList = Arrays.asList("指针式万用表"); + measureDataList.forEach(measureData -> { + // TODO: 2023/10/17 公式计算 +// //绝对误差计算，根据哪个List判断是哪个字典(或后续公式管理模块)，再判断是哪个公式 +// if(oneList.contains(request.getItemCategoryName())){ +// //=示值-标准值 +// measureData.setAbsoluteError(); +// }else if(twoList.contains(request.getItemCategoryName())){ +// //=被检表示值/(被检表示满量程值/标准值上限)-标准值 +// measureData.setAbsoluteError(); +// }else if(threeList.contains(request.getItemCategoryName())){ +// //ΔAN、ΔBN、ΔCN绝对误差计算，（1）电压：[示值/（Vpri/Vsec）]-标准值 （2）电流：[示值/（Ipri/Isec）]-标准值 +// //Vpri、Vsec、Ipri、Isec 可以手工编辑，会影响ΔAN、ΔBN、ΔCN 。后面单位Ipri、Isec默认单位为A，Vpri、Vsec默认单位为V +// measureData.setAbsoluteError(); +// }else if(fourList.contains(request.getItemCategoryName())){ +// //示值-标准值 +// measureData.setAbsoluteError(); +// } + }); + return ReturnUtil.success(measureDataList); + case DC_POWER_SUPPLY: + return null; + case RESISTANCE_THERMOMETER: + return null; + case PISTON_GAUGE: + return null; + case SPECTRUM_ANALYZER: + return null; + case SIGNAL_GENERATOR: + return null; + case MICROWAVE_ATTENUATION: + return null; + case FREQUENCY_STABILITY: + return null; + case OSCILLOSCOPE: + return null; + case TIME_FREQUENCY: + return null; + case LOW_POWER: + return null; + case LOW_FREQUENCY_SIGNAL_GENERATOR: + return null; + case VECTOR_NETWORK_ANALYZER: + return null; + case DEGREE_OF_DISTORTION: + return null; + default: + return ReturnUtil.success(); + } + + } + private void saveMeasureEquipment(BizBusinessDeviceMeasureInfo measureInfo) { List equipmentIds = measureInfo.getEquipmentIds(); List measureEquipmentList = new ArrayList<>(); @@ -358,29 +433,10 @@ //有部分套标准装置的不同检定项分类对应的表头合成不到一张表中的话，还要再belongStandardEquipment下再根据检定项分类进行存储到不同表 case CALIBRATOR: List measureDataList = measureInfo.getMeasureDataCalibratorList(); - //绝对误差计算：都需计算，oneList、fourList相同，其余计算各不同 - //最大允许误差计算：twoList、fourList为输入项不用计算，其余计算各不同 - List oneList = Arrays.asList("数字多用表（手持）", "数字多用表（台式）", "钳形电流表"); - List twoList = Arrays.asList("交流电压表", "交流电流表", "直流电压表", "直流电流表", "75mV电流表"); - List threeList = Arrays.asList("多功能电力参数测量仪"); - List fourList = Arrays.asList("指针式万用表"); - measureDataList.forEach(measureData -> { - measureData.setDataId(measureInfo.getId()); - // TODO: 2023/10/17 公式计算 -// //最大允许误差计算，根据哪个List判断是哪个字典，根据字典判断是哪个公式 -// if(oneList.contains(measureInfo.getItemCategoryName())){ -// //=准确度a*指针式仪表满量程值 -// BigDecimal bd1 = new BigDecimal(measureData.getAccuracyA()); -// BigDecimal bd2 = new BigDecimal(measureData.getFullScaleValue()); -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(bd1, bd2, measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getFullScaleValueUnit()); -// }else if(twoList.contains(measureItemInfo.getItemCategoryName())){ -// //=标准值上限*分辨力 -// BigDecimal maximumError = FormulaCalculateUtil.maximumError(maxStandardValue, measureData.getResolution(), measureData.getResolutionDigit()); -// measureData.setMaximumError(maximumError + measureData.getUnit()); -// } - }); - if (measureDataCalibratorService.saveBatch(measureDataList)) { + for (BizBusinessDeviceMeasureDataCalibrator dataCalibrator : measureDataList) { + dataCalibrator.setDataId(measureInfo.getId()); + } + if(measureDataCalibratorService.saveBatch(measureDataList)){ return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java index 238488a..f72dc99 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java @@ -183,4 +183,16 @@ Page resultPage = this.listPage(page, request); return resultPage.getRecords(); } + + @Override + public ReturnDTO asTemplate(Long id) { + BizBusinessDeviceMeasureItemInfo measureItemInfo = new BizBusinessDeviceMeasureItemInfo(); + measureItemInfo.setId(id); + measureItemInfo.setAsTemplate(1); + if(this.baseMapper.updateById(measureItemInfo) > 0){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java new file mode 100644 index 0000000..ea0573d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoEquipmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckInfoEquipmentMapper; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +@Service +public class BizEquipmentStandardCheckInfoEquipmentServiceImpl extends ServiceImpl implements IBizEquipmentStandardCheckInfoEquipmentService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index a1c25e2..4d142f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -13,6 +14,7 @@ import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.model.equipment.*; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckDataCalibratorService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoEquipmentService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService; import com.casic.missiles.utils.CasicBeanUtil; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -49,6 +51,10 @@ private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; @Autowired private BizEquipmentInfoMapper equipmentInfoMapper; + @Autowired + private IBizEquipmentStandardCheckInfoEquipmentService checkInfoEquipmentService; + @Autowired + private BizEquipmentStandardCheckInfoEquipmentMapper checkInfoEquipmentMapper; @Override public Page listPage(Page page, CheckInfoListRequest request) { @@ -67,6 +73,19 @@ if(this.baseMapper.insert(checkInfo) <= 0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + //关联表-核查标准设备id + List checkEquipmentIdList = checkInfo.getCheckEquipmentIdList(); + List checkInfoEquipments = new ArrayList<>(); + checkEquipmentIdList.forEach(equipmentId -> { + BizEquipmentStandardCheckInfoEquipment checkInfoEquipment = new BizEquipmentStandardCheckInfoEquipment(); + checkInfoEquipment.setDataId(checkInfo.getId()); + checkInfoEquipment.setCheckEquipmentId(equipmentId); + checkInfoEquipments.add(checkInfoEquipment); + }); + if(!checkInfoEquipmentService.saveBatch(checkInfoEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + //关联表-核查数据 //不同套标准装置处理 if(!addByStandardEquipmentTypeHandle(checkInfo)) { @@ -74,7 +93,7 @@ } //保存修改记录 saveCheckModifyRecord(checkInfo, "新建"); - return ReturnUtil.success(); + return ReturnUtil.success(checkInfo.getId()); } @Override @@ -103,8 +122,9 @@ return ReturnUtil.success(); } //核查标准设备 - BizEquipmentInfo checkEquipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getCheckEquipmentId()); - standardCheckInfo.setCheckEquipmentInfo(checkEquipmentInfo); + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(id); + standardCheckInfo.setCheckEquipmentList(checkInfoEquipments); + //被核查设备 BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(standardCheckInfo.getEquipmentId()); standardCheckInfo.setEquipmentInfo(equipmentInfo); @@ -137,6 +157,19 @@ return resultPage.getRecords(); } + @Override + public ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request) { + if(!CollectionUtils.isEmpty(request.getCheckDataCalibratorList())){ + List checkDataCalibratorList = request.getCheckDataCalibratorList(); + checkDataCalibratorList.forEach(checkData -> { + // TODO: 2023/10/17 公式计算 + + }); + return ReturnUtil.success(checkDataCalibratorList); + } + return ReturnUtil.success(); + } + private void queryByStandardEquipmentTypeHandle(BizEquipmentStandardCheckInfo standardCheckInfo, String belongStandardEquipment) { //19套标准装置判断，获取对应核查数据列表 switch (belongStandardEquipment) { @@ -213,11 +246,6 @@ //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List） if(!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())){ List checkDataCalibratorList = checkInfo.getCheckDataCalibratorList(); - checkDataCalibratorList.forEach(checkData -> { - checkData.setDataId(checkInfo.getId()); - // TODO: 2023/10/17 公式计算 - }); - if(checkDataCalibratorService.saveBatch(checkDataCalibratorList)){ return true; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java new file mode 100644 index 0000000..db316fb --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.service.Impl.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizLabRelDeptMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizLabRelDeptServiceImpl extends ServiceImpl implements IBizLabRelDeptService { + + @Override + public List selectBizLabRelDeptPage(Page page, QueryWrapper query) { + return this.baseMapper.selectBizLabRelDeptPage(page, query); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 36bba09..0ec4f91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; +import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,9 +21,36 @@ */ @Service public class BizQualityConferenceRecordServiceImpl extends ServiceImpl implements IBizQualityConferenceRecordService { + private final IBizQualityConferenceRelUserService bizQualityConferenceRelUserService; + + public BizQualityConferenceRecordServiceImpl(IBizQualityConferenceRelUserService bizQualityConferenceRelUserService) { + this.bizQualityConferenceRelUserService = bizQualityConferenceRelUserService; + } @Override public List relWork(String type) { return null; } + + @Override + public boolean save(BizQualityConferenceRecord entity) { + super.save(entity); + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + return true; + } + + @Override + public boolean updateById(BizQualityConferenceRecord entity) { + super.updateById(entity); + + if (entity.getQualityUserDto() != null) { + entity.getQualityUserDto().setId(entity.getId()); + bizQualityConferenceRelUserService.saveUsers(entity.getQualityUserDto()); + } + + return true; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 32ab33a..1ccb63a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -1,14 +1,21 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; +import com.casic.missiles.modular.system.dto.UserDTO; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -24,4 +31,40 @@ public List list(Wrapper queryWrapper) { return super.list(queryWrapper); } + + /** + * @param dto 用户集合 + */ + @Transactional + @Override + public void saveUsers(QualityUserDTO dto) { + //检索当前会议用户集合 + QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id", dto.getId()); + List list = list(query); + List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); + List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + //过滤移除名单 + List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); + //过滤新增名单 + List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); + + //移除清理名单 + List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); + removeBatchByIds(delIds); + + //添加新增名单 + List userList = adds.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setIsConfirm(0); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + //保存用户信息 + saveBatch(userList); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveFileRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveFileRelMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; +import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveFileRelServiceImpl extends ServiceImpl implements IBizQualityCorrectiveFileRelService { + + @Override + public List selectBizQualityCorrectiveFileRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveFileRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java new file mode 100644 index 0000000..766c09a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -0,0 +1,33 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + + + +/** + *

+ * 纠正措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityCorrectiveRecordServiceImpl extends ServiceImpl implements IBizQualityCorrectiveRecordService { + + @Override + public List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityCorrectiveRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java new file mode 100644 index 0000000..0740189 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; +import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityNonConformanceRepServiceImpl extends ServiceImpl implements IBizQualityNonConformanceRepService { + + @Override + public List selectBizQualityNonConformanceRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityNonConformanceRepPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java new file mode 100644 index 0000000..30fcd4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.service.quality.IBizQualityPreventRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityPreventRecordServiceImpl extends ServiceImpl implements IBizQualityPreventRecordService { + + @Override + public List selectBizQualityPreventRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityPreventRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java new file mode 100644 index 0000000..4f0ca46 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityProcessRecordMapper; +import com.casic.missiles.model.quality.BizQualityProcessRecord; +import com.casic.missiles.service.quality.IBizQualityProcessRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityProcessRecordServiceImpl extends ServiceImpl implements IBizQualityProcessRecordService { + + @Override + public List selectBizQualityProcessRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityProcessRecordPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java new file mode 100644 index 0000000..7722480 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; +import com.casic.missiles.model.quality.BizQualityRepRel; +import com.casic.missiles.service.quality.IBizQualityRepRelService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + + @Override + public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualityRepRelPage(query, page); + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java new file mode 100644 index 0000000..3769fa1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -0,0 +1,75 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.enums.quality.QualityFileNoEnum; +import com.casic.missiles.enums.quality.QualityFileTypeEnum; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import com.casic.missiles.service.quality.IBizLabRelDeptService; +import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService; +import com.casic.missiles.utils.NoGeneratorUtil; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService { + private final IBizLabRelDeptService relDeptService; + private final AbstractPermissionContext permissionContext; + + public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) { + this.relDeptService = relDeptService; + this.permissionContext = permissionContext; + } + + @Override + public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); + } + + @Override + public Long selectMaxNo(QueryWrapper query) { + return this.baseMapper.selectMaxNo(query); + } + + @Override + public List labList(QueryWrapper query) { + List deptList = relDeptService.list(query); + for (BizLabRelDept bizLabRelDept : deptList) { + bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId())); + } + return deptList; + } + + @Override + public boolean save(BizQualitySupervisionRecord entity) { + //生成文件编码 系统号类同 + //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号 + String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), 0l); + //检索最大编码 + String queryCode = code.substring(0, 15); + + QueryWrapper query = new QueryWrapper<>(); + query.like("file_code", queryCode); + Long maxNo = this.selectMaxNo(query); + String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), entity.getBizLabCode(), QualityFileTypeEnum.TYPE_01.getCode(), entity.getGroupNo(), maxNo); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + + return super.save(entity); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java new file mode 100644 index 0000000..50fea02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -0,0 +1,29 @@ +package com.casic.missiles.service.Impl.quality; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 质量监督报告 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +@Service +public class BizQualitySupervisionRepServiceImpl extends ServiceImpl implements IBizQualitySupervisionRepService { + @Override + public List selectBizQualitySupervisionRepPage(QueryWrapper query, Page page) { + return this.baseMapper.selectBizQualitySupervisionRepPage(query, page); + } +} \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index a730958..273a88b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -7,6 +7,9 @@ import com.casic.missiles.service.quality.IBizQualityTemplateItemService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板项 服务实现类 @@ -18,4 +21,23 @@ @Service public class BizQualityTemplateItemServiceImpl extends ServiceImpl implements IBizQualityTemplateItemService { + @Override + public void saveList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(new Date()); + } + saveBatch(bizQualityTemplateItems); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplateItems) { + for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { + bizQualityTemplateItem.setCreateTime(new Date()); + if (bizQualityTemplateItem.getId() != null) { + bizQualityTemplateItem.setUpdateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplateItems); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index 616c1c0..9e93d7f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -2,11 +2,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.mapper.quality.BizQualityTemplateMapper; import com.casic.missiles.model.quality.BizQualityTemplate; import com.casic.missiles.service.quality.IBizQualityTemplateService; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** *

* 质量活动模板信息 服务实现类 @@ -17,5 +22,35 @@ */ @Service public class BizQualityTemplateServiceImpl extends ServiceImpl implements IBizQualityTemplateService { + private final AbstractPermissionContext permissionContext; + public BizQualityTemplateServiceImpl(AbstractPermissionContext permissionContext) { + this.permissionContext = permissionContext; + } + + @Override + public void saveList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + } + saveBatch(bizQualityTemplates); + } + + @Override + public void saveOrUpdateList(List bizQualityTemplates) { + for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { + bizQualityTemplate.setUpdateTime(new Date()); + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + bizQualityTemplate.setUpdateId(authUser.getId()); + bizQualityTemplate.setUpdateName(authUser.getName()); + if (bizQualityTemplate.getId() != null) { + bizQualityTemplate.setCreateTime(new Date()); + } + } + saveOrUpdateBatch(bizQualityTemplates); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java index 87f5378..7e2f28d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureInfoService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoCalculateHandleRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo; @@ -36,4 +37,6 @@ List list(MeasureInfoListRequest request) throws Exception; List measureInfoListByIds(List ids) throws Exception; + + ReturnDTO calculateHandle(MeasureInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java index 5b00b90..d87d86c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureItemInfoService.java @@ -1,12 +1,12 @@ package com.casic.missiles.service.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemConfigRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemDetailRequest; import com.casic.missiles.dto.business.deviceMeasure.MeasureItemListRequest; import com.casic.missiles.model.business.BizBusinessDeviceMeasureItemInfo; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -32,4 +32,6 @@ List list(MeasureItemListRequest request) throws Exception; + ReturnDTO asTemplate(Long id); + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java new file mode 100644 index 0000000..43b7986 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoEquipmentService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfoEquipment; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 服务类 + *

+ * + * @author wangpeng + * @since 2023-10-23 + */ +public interface IBizEquipmentStandardCheckInfoEquipmentService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java index 7656054..4882611 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckInfoService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.CheckInfoCalculateHandleRequest; import com.casic.missiles.dto.equipment.CheckInfoListRequest; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -29,4 +30,6 @@ List checkInfoListByIds(List ids); List list(CheckInfoListRequest request); + + ReturnDTO calculateHandle(CheckInfoCalculateHandleRequest request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java index 4b55df7..c4a1b9a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SupplierConsumableGoodsUseEventPostProcessor.java @@ -50,7 +50,7 @@ List> lists = approvalOperateService.approvalLog(processId); if(!CollectionUtils.isEmpty(lists) && !CollectionUtils.isEmpty(lists.get(1))){ List approvalLogResponses = lists.get(1); - ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(1); + ApprovalLogResponse approvalLogResponse = approvalLogResponses.get(0); String approver = approvalLogResponse.getAssigneeName(); goodsUseDetailMapper.updateByRecordId(id, approver); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java new file mode 100644 index 0000000..66e9f30 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java @@ -0,0 +1,23 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; + + +/** + *

+ * 业务编码关联组织机构 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizLabRelDeptService extends IService { + /** + * 业务编码关联组织机构 分页检索 + */ + List selectBizLabRelDeptPage(Page page,QueryWrapper query); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java index a92fe43..8fd60da 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityConferenceRelUserService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.dto.quality.QualityUserDTO; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; /** @@ -14,4 +15,10 @@ */ public interface IBizQualityConferenceRelUserService extends IService { + /** + * 会议用户报存 + * + * @param dto 用户集合 + */ + void saveUsers(QualityUserDTO dto); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java new file mode 100644 index 0000000..cb60b02 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveFileRelService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单关联文件 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityCorrectiveFileRelService extends IService { + /** + * 纠正措施处理单关联文件 分页检索 + */ + List selectBizQualityCorrectiveFileRelPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java new file mode 100644 index 0000000..be9f974 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; + +import java.util.List; + + +/** + *

+ * 纠正措施处理单 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityCorrectiveRecordService extends IService { + /** + * 纠正措施处理单 分页检索 + */ + List selectBizQualityCorrectiveRecordPage(QueryWrapper query, Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java new file mode 100644 index 0000000..0deb82f --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; + +import java.util.List; + + +/** + *

+ * 质量活动不符合情况分析报告 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityNonConformanceRepService extends IService { + /** + * 质量活动不符合情况分析报告 分页检索 + */ + List selectBizQualityNonConformanceRepPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java new file mode 100644 index 0000000..806645b --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityPreventRecord; + +import java.util.List; + + +/** + *

+ * 预防措施处理单 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityPreventRecordService extends IService { + /** + * 预防措施处理单 分页检索 + */ + List selectBizQualityPreventRecordPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityProcessRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityProcessRecordService.java new file mode 100644 index 0000000..02322ca --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityProcessRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityProcessRecord; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录过程记录 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityProcessRecordService extends IService { + /** + * 质量活动监督记录过程记录 分页检索 + */ + List selectBizQualityProcessRecordPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityRepRelService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityRepRelService.java new file mode 100644 index 0000000..fb7d90c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityRepRelService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualityRepRel; + +import java.util.List; + + +/** + *

+ * 质量监督报告关联监督记录 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualityRepRelService extends IService { + /** + * 质量监督报告关联监督记录 分页检索 + */ + List selectBizQualityRepRelPage(QueryWrapper query,Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java new file mode 100644 index 0000000..513bf8f --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java @@ -0,0 +1,35 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizLabRelDept; +import com.casic.missiles.model.quality.BizQualitySupervisionRecord; + +import java.util.List; + + +/** + *

+ * 质量活动监督记录 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualitySupervisionRecordService extends IService { + /** + * 质量活动监督记录 分页检索 + */ + List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page); + + /** + * 最大编号查询 + * + * @param query 检索条件 + * @return + */ + Long selectMaxNo(QueryWrapper query); + + List labList(QueryWrapper query); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRepService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRepService.java new file mode 100644 index 0000000..be74488 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRepService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.quality; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.quality.BizQualitySupervisionRep; + +import java.util.List; + + +/** + *

+ * 质量监督报告 服务类 + *

+ * + * @author lwh + * @date 2023-10-21 + */ +public interface IBizQualitySupervisionRepService extends IService { + /** + * 质量监督报告 分页检索 + */ + List selectBizQualitySupervisionRepPage(QueryWrapper query, Page page); +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityTemplateItemService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityTemplateItemService.java index e32d9bb..6effcb3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityTemplateItemService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityTemplateItemService.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.model.quality.BizQualityTemplateItem; +import java.util.List; + /** *

@@ -14,4 +16,11 @@ */ public interface IBizQualityTemplateItemService extends IService { + /** + * 保存列表 + * @param bizQualityTemplateItems + */ + void saveList(List bizQualityTemplateItems); + + void saveOrUpdateList(List bizQualityTemplateItems); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityTemplateService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityTemplateService.java index 1c61571..3f60c2b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityTemplateService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityTemplateService.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.model.quality.BizQualityTemplate; +import java.util.List; + /** *

* 质量活动模板信息 服务类 @@ -18,4 +20,9 @@ default boolean save(BizQualityTemplate entity) { return IService.super.save(entity); } + + void saveList(List bizQualityTemplates); + + void saveOrUpdateList(List bizQualityTemplates); + }